Skip to content

Commit

Permalink
base v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Maksim Kostromin committed Nov 17, 2018
1 parent c4735e6 commit 636e70e
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 11 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
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ ARG JAVA_OPTS_ARGS='\
ENV JAVA_OPTS="${JAVA_OPTS} ${JAVA_OPTS_ARGS}"
# execute e2e tests as non root, but sudo user
USER root
RUN apt update -y \
RUN apt-get update -y || echo 'oops...' \
&& apt-get clean -y \
&& apt install --fix-missing -y sudo openssh-server \
&& apt-get install --fix-missing -y sudo openssh-server \
&& useradd -m e2e && echo 'e2e:e2e' | chpasswd \
&& adduser e2e sudo \
&& echo '\ne2e ALL=(ALL:ALL) NOPASSWD: ALL' >> /etc/sudoers \
Expand All @@ -23,18 +23,20 @@ RUN apt update -y \
WORKDIR /home/e2e
USER e2e
# prepare
RUN sudo apt-get update -y \
RUN sudo apt-get update -y || echo 'oops...' \
&& sudo apt-get install --fix-missing -y wget bash software-properties-common
# jdk8
RUN sudo apt-add-repository -y ppa:webupd8team/java \
&& sudo apt-get update -y \
&& sudo apt-get update -y || echo 'oops...' \
&& sudo echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections \
&& sudo echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections \
&& sudo apt-get install --fix-missing -y oracle-java8-installer oracle-java8-set-default oracle-java8-unlimited-jce-policy
# xvfb stuff
RUN sudo apt-get install --fix-missing -y xvfb xorg xvfb dbus-x11 xfonts-100dpi xfonts-75dpi xfonts-cyrillic \
&& echo '#!/bin/bash \n\
sudo chown -R e2e:e2e ~/ || true \n\
echo "${JAVA_OPTS}" \n\
java -version \n\
echo "starting Xvfb..." \n\
sudo Xvfb -ac :99 -screen 0 1280x1024x16 & \n' \
>> ./start-xvfb \
Expand Down
31 changes: 26 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# E2E base image [![Build Status](https://travis-ci.org/daggerok/e2e.svg?branch=ubuntu-xvfb-jdk8-base)](https://travis-ci.org/daggerok/e2e)
automated build for docker hub

stack:
versions:

- 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 @@ -18,16 +21,34 @@ available images:

tags:

- [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)

## Usage

### just create your test Dockerfile
Expand All @@ -53,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 @@ -118,6 +139,6 @@ git push origin $tagName # push tag
git add .
git commit -am ...
git push origin ubuntu-xvfb-jdk8-base
git tag ubuntu-xvfb-jdk8-base-v1
git tag ubuntu-xvfb-jdk8-base-v2
git push origin --tags
```

0 comments on commit 636e70e

Please sign in to comment.