Skip to content

Commit

Permalink
v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Maksim Kostromin committed Nov 17, 2018
1 parent e0a3fe5 commit 5280943
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 38 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
notifications:
email: false
git:
depth: false
service:
- docker
env:
global:
- VERSION=v1
- VERSION=v2
- DOCKER_IMAGE="daggerok/e2e:${TRAVIS_BRANCH}"
- IMAGE="${TRAVIS_BRANCH}-${TRAVIS_BUILD_NUMBER}"
- TERM=dumb
- secure: KLDnrnXgD6pbAa9CwwiEvcbO1umX2FrbFc/b2uYYVbSrHRI64V5iwYnYDLE4Ldx8CL1/5pzpSbBciHYXOcUZGu9jVm4GuCQd0RAZYwymG8rJBxcfdyuGRooZHjGB5A3BtYtDvViMI3oLe2J1Su5dycsASfc6Va51QVx6L/Jm69yYG9/MmVsCh3jWHpA3rrGhd5vKmfJeb6EUjckIf2iT1flifHr5C6dv3rLtVisiLSUq4YEEqzNWOoI2qjTUgXidXA3XTvrXvm0GgRc/eKfZECPmPsG+Oo0jiNRLJeOnlOmKPDbDgHbLC1yQ8l5C27LZ9XUNRPDZ8Hh5vnywhvs5Jw1+sVdyv0NYwKY0eclQlL7Zu7y0fUODv6g7EpE6XW1q6SYQsoChe5NGG6RD9A+NI51UNmSYK2ziwu9bddN5Mr++x13BZhicaWqELwJ9EXSD8WFbtminFASnZwRuEVDsSHGiJBuhapAqaLFroC3PiYpXYta8Fdw+9uXJpQ35BtPQGAjZdO9fUn1vwJ/7G7IjQH58+FGUZqfLdv1lB8n5m4hj2L9bblDA6et7ubhks9EvTYI/SiIqeeYuQEAov0RZEaVxneRXdeClFWWEdYOFrzwBDqL4hRAz2vyzdySv0iRmfbWwVcOM7qsWDN2CbFit6UTU5XnoZiUZ+DkBd2zdxmI=
addons:
apt:
update: true
packages:
- bash
- docker-ce
Expand Down
54 changes: 27 additions & 27 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
FROM daggerok/e2e:trusty-xvfb-jdk8-base-v1
FROM daggerok/e2e:trusty-xvfb-jdk8-base-v2
LABEL MAINTAINER='Maksim Kostromin <daggerok@gmail.com> https://github.com/daggerok'
ENV DISPLAY=':99' \
GECKO_DRV_VER='0.21.0' \
CHROME_DRV_VER='2.41'
GECKO_DRV_VER='0.23.0' \
CHROME_DRV_VER='2.43'
# firefox
RUN sudo add-apt-repository ppa:mozillateam/firefox-next \
&& sudo apt-get update -y \
&& sudo apt-get clean -y \
&& sudo apt-get install --fix-missing -y firefox
RUN sudo add-apt-repository ppa:mozillateam/firefox-next && \
sudo apt-get update -y || echo 'oops...' && \
sudo apt-get clean -y && \
sudo apt-get install --fix-missing -y firefox
# gecko driver
RUN wget https://github.com/mozilla/geckodriver/releases/download/v${GECKO_DRV_VER}/geckodriver-v${GECKO_DRV_VER}-linux64.tar.gz \
&& tar -xvzf geckodriver* \
&& sudo mv -f geckodriver /usr/bin/ \
&& sudo chmod +x /usr/bin/geckodriver \
&& rm -rf geckodriver-v${GECKO_DRV_VER}-linux64.tar.gz
RUN wget https://github.com/mozilla/geckodriver/releases/download/v${GECKO_DRV_VER}/geckodriver-v${GECKO_DRV_VER}-linux64.tar.gz && \
tar -xvzf geckodriver* && \
sudo mv -f geckodriver /usr/bin/ && \
sudo chmod +x /usr/bin/geckodriver && \
sudo rm -rf geckodriver-v${GECKO_DRV_VER}-linux64.tar.gz
# chrome
RUN sudo apt-get install --fix-missing -y \
fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 \
libatk1.0-0 libcairo2 libcups2 libgdk-pixbuf2.0-0 libgtk-3-0 \
libnspr4 libnss3 libx11-xcb1 libxss1 xdg-utils \
&& wget -O google-chrome-stable.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& sudo dpkg -i google-chrome-stable.deb \
&& rm -rf ./google-chrome-stable.deb
RUN sudo apt-get install --fix-missing -y \
fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 \
libatk1.0-0 libcairo2 libcups2 libgdk-pixbuf2.0-0 libgtk-3-0 \
libnspr4 libnss3 libx11-xcb1 libxss1 xdg-utils && \
wget -O google-chrome-stable.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
sudo dpkg -i google-chrome-stable.deb && \
sudo rm -rf ./google-chrome-stable.deb
# chrome driver
RUN wget https://chromedriver.storage.googleapis.com/${CHROME_DRV_VER}/chromedriver_linux64.zip \
&& unzip chromedriver_linux64.zip \
&& sudo mv -f chromedriver /usr/bin/ \
&& rm -rf chromedriver_linux64.zip
RUN wget https://chromedriver.storage.googleapis.com/${CHROME_DRV_VER}/chromedriver_linux64.zip && \
unzip chromedriver_linux64.zip && \
sudo mv -f chromedriver /usr/bin/ && \
sudo rm -rf chromedriver_linux64.zip
# cleanup and reduce image size
RUN sudo apt-get autoremove --purge -y \
&& sudo apt-get autoclean -y \
&& sudo apt-get clean -y \
&& rm -rf /tmp/* || true
RUN sudo apt-get autoremove --purge -y && \
sudo apt-get autoclean -y && \
sudo apt-get clean -y && \
sudo rm -rf /tmp/* || true
# docker exec -it
CMD /bin/bash
31 changes: 22 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# E2E image [![Build Status](https://travis-ci.org/daggerok/e2e.svg?branch=trusty-xvfb-jdk8)](https://travis-ci.org/daggerok/e2e)
automated build for docker hub

stack:
variations:

- Docker Ubuntu `Bionic 18.04`
- Docker Ubuntu `Xenial 16.04`
- Docker Ubuntu `Trusty 14.04`
- Docker Ubuntu `Precise 12.04`
- Oracle Java Development Kit 8
- Chrome with chrome driver version: `2.41`
- Firefox with gecko driver version: `0.21.0`
- Chrome with chrome driver version: `2.43`
- Firefox with gecko driver version: `0.23.0`
- Установка X Virtual Frame Buffer (xvfb)

available images:
Expand All @@ -19,22 +21,33 @@ available images:

tags:

- [latest (trusty-xvfb-jdk8)](https://github.com/daggerok/e2e/tree/trusty-xvfb-jdk8-v1)
- [latest (bionic-xvfb-jdk8-firefox)](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-firefox-v2)
- [bionic-xvfb-jdk8](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-v2)
- [bionic-xvfb-jdk8-chrome](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-chrome-v2)
- [bionic-xvfb-jdk8-firefox](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-firefox-v2)
- [bionic-xvfb-jdk8-base](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-base-v2)

- [ubuntu-xvfb-jdk8](https://github.com/daggerok/e2e/tree/ubuntu-xvfb-jdk8-v1)
- [ubuntu-xvfb-jdk8-chrome](https://github.com/daggerok/e2e/tree/ubuntu-xvfb-jdk8-chrome-v1)
- [ubuntu-xvfb-jdk8-firefox](https://github.com/daggerok/e2e/tree/ubuntu-xvfb-jdk8-firefox-v1)
- [ubuntu-xvfb-jdk8-base](https://github.com/daggerok/e2e/tree/ubuntu-xvfb-jdk8-base-v1)

- [bionic-xvfb-jdk8](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-v1)
- [bionic-xvfb-jdk8-chrome](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-chrome-v1)
- [bionic-xvfb-jdk8-firefox](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-firefox-v1)
- [bionic-xvfb-jdk8-base](https://github.com/daggerok/e2e/tree/bionic-xvfb-jdk8-base-v1)

- [xenial-xvfb-jdk8](https://github.com/daggerok/e2e/tree/xenial-xvfb-jdk8-v1)
- [xenial-xvfb-jdk8-chrome](https://github.com/daggerok/e2e/tree/xenial-xvfb-jdk8-chrome-v1)
- [xenial-xvfb-jdk8-firefox](https://github.com/daggerok/e2e/tree/xenial-xvfb-jdk8-firefox-v1)
- [xenial-xvfb-jdk8-base](https://github.com/daggerok/e2e/tree/xenial-xvfb-jdk8-base-v1)

- [trusty-xvfb-jdk8](https://github.com/daggerok/e2e/tree/trusty-xvfb-jdk8-v1)
- [trusty-xvfb-jdk8-chrome](https://github.com/daggerok/e2e/tree/trusty-xvfb-jdk8-chrome-v1)
- [trusty-xvfb-jdk8-firefox](https://github.com/daggerok/e2e/tree/trusty-xvfb-jdk8-firefox-v1)
- [trusty-xvfb-jdk8-base](https://github.com/daggerok/e2e/tree/trusty-xvfb-jdk8-base-v1)

- [precise-xvfb-jdk8](https://github.com/daggerok/e2e/tree/precise-xvfb-jdk8-v1)
- [precise-xvfb-jdk8-chrome](https://github.com/daggerok/e2e/tree/precise-xvfb-jdk8-chrome-v1)
- [precise-xvfb-jdk8-firefox](https://github.com/daggerok/e2e/tree/precise-xvfb-jdk8-firefox-v1)
- [precise-xvfb-jdk8-base](https://github.com/daggerok/e2e/tree/precise-xvfb-jdk8-base-v1)

## Usage

Expand All @@ -61,7 +74,7 @@ COPY . .

```dockerfile

FROM daggerok/e2e:ubuntu-xvfb-jdk8-firefox-v1
FROM daggerok/e2e:ubuntu-xvfb-jdk8-firefox-v2
WORKDIR 'project-directory/'
ENTRYPOINT start-xvfb && ./gradlew test firefox
COPY . .
Expand Down Expand Up @@ -126,6 +139,6 @@ git push origin $tagName # push tag
git add .
git commit -am ...
git push origin trusty-xvfb-jdk8
git tag trusty-xvfb-jdk8-v1
git tag trusty-xvfb-jdk8-v2
git push origin --tags
```

0 comments on commit 5280943

Please sign in to comment.