Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit 13a2072

Browse files
committed
Test with docker-compose 1.14.0
1 parent 87cc7c0 commit 13a2072

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ matrix:
2828
- docker
2929
env:
3030
- DOCKER_VERSION="stable"
31-
DOCKER_COMPOSE_VERSION="1.13.0"
31+
DOCKER_COMPOSE_VERSION="1.14.0"
3232
DOCKER_PUSH=true
3333
DOCKER_PUSH_LATEST=true
3434

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ RUN apt-get -qqy update \
598598
&& mkdir -p chrome-deb \
599599
&& wget -nv "${CHROME_URL}/google-chrome-stable_current_amd64.deb" \
600600
-O "./chrome-deb/google-chrome-stable_current_amd64.deb" \
601-
&& apt -qyy --no-install-recommends install \
601+
&& apt-get -qyy --no-install-recommends install \
602602
"${CHROME_BASE_DEB_PATH}-stable_current_amd64.deb" \
603603
&& rm "${CHROME_BASE_DEB_PATH}-stable_current_amd64.deb" \
604604
&& rm -rf ./chrome-deb \
@@ -636,8 +636,8 @@ RUN wget -nv -O chromedriver_linux${CPU_ARCH}.zip ${CHROME_DRIVER_URL} \
636636
&& unzip chromedriver_linux${CPU_ARCH}.zip \
637637
&& rm chromedriver_linux${CPU_ARCH}.zip \
638638
&& mv chromedriver \
639-
chromedriver-$CHROME_DRIVER_VERSION \
640-
&& chmod 755 chromedriver-$CHROME_DRIVER_VERSION \
639+
chromedriver-${CHROME_DRIVER_VERSION} \
640+
&& chmod 755 chromedriver-${CHROME_DRIVER_VERSION} \
641641
&& ln -s chromedriver-${CHROME_DRIVER_VERSION} \
642642
chromedriver \
643643
&& sudo ln -s /home/seluser/chromedriver /usr/bin

TBD_DOCKER_TAG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
+ Timezone: TBD_TIME_ZONE
1212
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
1313
+ Python: TBD_PYTHON_VERSION
14-
+ Tested on kernel dev host: 4.4.0-79-generic x86_64
14+
+ Tested on kernel dev host: 4.4.0-83-generic x86_64
1515
+ Tested on kernel CI host: TBD_HOST_UNAME
1616
+ Built at dev host with: Docker version 17.05.0-ce, build 89658be
1717
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
18-
+ Built at dev host with: Docker Compose version 1.13.0, build 1719ceb
18+
+ Built at dev host with: Docker Compose version 1.14.0, build c7bdf9e
1919
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
2020
+ Image size: TBD_IMAGE_SIZE
2121
+ Digest: TBD_DIGEST

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.1-p17
1+
3.3.1-p18

0 commit comments

Comments
 (0)