baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'v1.3'

Browse source
This commit is contained in:
Fernandez Ludovic 2017-06-27 23:27:00 +02:00
commit 36c88111de
5 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.semaphoreci/vars
View file

@ -3,8 +3,6 @@ set -e
export REPO='containous/traefik' export REPO='containous/traefik'
export DOCKER_VERSION=17.03.0
if VERSION=$(git describe --exact-match --abbrev=0 --tags); if VERSION=$(git describe --exact-match --abbrev=0 --tags);
then then
export VERSION export VERSION

3
.travis.yml
View file

@ -10,7 +10,6 @@ env:
- VERSION: $TRAVIS_TAG - VERSION: $TRAVIS_TAG
- CODENAME: raclette - CODENAME: raclette
- N_MAKE_JOBS: 2 - N_MAKE_JOBS: 2
- DOCKER_VERSION: 1.12.6
script: script:
- echo "Skipping tests... (Tests are executed on SemaphoreCI)" - echo "Skipping tests... (Tests are executed on SemaphoreCI)"
@ -20,7 +19,7 @@ before_deploy:
if ! [ "$BEFORE_DEPLOY_RUN" ]; then if ! [ "$BEFORE_DEPLOY_RUN" ]; then
export BEFORE_DEPLOY_RUN=1; export BEFORE_DEPLOY_RUN=1;
sudo -E apt-get -yq update; sudo -E apt-get -yq update;
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-engine=${DOCKER_VERSION}*; sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-ce=${DOCKER_VERSION}*;
docker version; docker version;
pip install --user -r requirements.txt; pip install --user -r requirements.txt;
make -j${N_MAKE_JOBS} crossbinary-parallel; make -j${N_MAKE_JOBS} crossbinary-parallel;

2
build.Dockerfile
View file

@ -15,7 +15,7 @@ RUN go get github.com/jteeuwen/go-bindata/... \
&& go get github.com/sgotti/glide-vc && go get github.com/sgotti/glide-vc
# Which docker version to test on # Which docker version to test on
ARG DOCKER_VERSION=1.10.3 ARG DOCKER_VERSION=17.03.1
# Which glide version to test on # Which glide version to test on

2
script/deploy-docker.sh
View file

@ -10,7 +10,7 @@ fi
# create docker image containous/traefik # create docker image containous/traefik
echo "Updating docker containous/traefik image..." echo "Updating docker containous/traefik image..."
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker tag containous/traefik containous/traefik:${TRAVIS_COMMIT} docker tag containous/traefik containous/traefik:${TRAVIS_COMMIT}
docker push containous/traefik:${TRAVIS_COMMIT} docker push containous/traefik:${TRAVIS_COMMIT}
docker tag containous/traefik containous/traefik:experimental docker tag containous/traefik containous/traefik:experimental

2
script/deploy.sh
View file

@ -30,7 +30,7 @@ git push -q --follow-tags -u origin master > /dev/null 2>&1
# create docker image emilevauge/traefik (compatibility) # create docker image emilevauge/traefik (compatibility)
echo "Updating docker emilevauge/traefik image..." echo "Updating docker emilevauge/traefik image..."
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker tag containous/traefik emilevauge/traefik:latest docker tag containous/traefik emilevauge/traefik:latest
docker push emilevauge/traefik:latest docker push emilevauge/traefik:latest
docker tag emilevauge/traefik:latest emilevauge/traefik:${VERSION} docker tag emilevauge/traefik:latest emilevauge/traefik:${VERSION}