Skip to content

Commit 96fcf97

Browse files
committed
Updated baseimage
1 parent 3998857 commit 96fcf97

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ language: bash
33
services:
44
- docker
55

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+
612
install:
713
- ./scripts/travisDockerSetup.sh
814
- docker pull multiarch/qemu-user-static:register
@@ -26,8 +32,3 @@ deploy:
2632
script: make docker_push_latest BRANCH=$TRAVIS_BRANCH
2733
on:
2834
tags: true
29-
30-
addons:
31-
apt:
32-
packages:
33-
- docker-ce

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default: list
33
DOCKER_IMAGE ?= edofede/nginx-php-fpm
44

55
ARCHS ?= amd64 arm32v6 arm32v7 i386 ppc64le
6-
BASEIMAGE_BRANCH ?= 2.2
6+
BASEIMAGE_BRANCH ?= 2.3
77

88
GITHUB_TOKEN ?= "NONE"
99

0 commit comments

Comments
 (0)