File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,12 @@ language: bash
3
3
services :
4
4
- docker
5
5
6
+ before_install :
7
+ - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
8
+ - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
9
+ - sudo apt-get update
10
+ - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
11
+
6
12
install :
7
13
- ./scripts/travisDockerSetup.sh
8
14
- docker pull multiarch/qemu-user-static:register
@@ -26,8 +32,3 @@ deploy:
26
32
script : make docker_push_latest BRANCH=$TRAVIS_BRANCH
27
33
on :
28
34
tags : true
29
-
30
- addons :
31
- apt :
32
- packages :
33
- - docker-ce
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ default: list
3
3
DOCKER_IMAGE ?= edofede/nginx-php-fpm
4
4
5
5
ARCHS ?= amd64 arm32v6 arm32v7 i386 ppc64le
6
- BASEIMAGE_BRANCH ?= 2.2
6
+ BASEIMAGE_BRANCH ?= 2.3
7
7
8
8
GITHUB_TOKEN ?= "NONE"
9
9
You can’t perform that action at this time.
0 commit comments