Skip to content

Commit 30f627e

Browse files
committed
Separate deploy of latest, tag
1 parent cc3b9c4 commit 30f627e

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ deploy:
3434
password:
3535
secure: fUK/7GUs1PCMFASOxi/iWY57LfWKUivyT4r+5Gp2GaH8ytG1ux83xnSHO3e1Jrjgdak8VcV4vhwXkhU/Eno6xjHA+1G/jeIBytR9k4FKvH89gFX416/MhCxn1WMAX3AQzKqm3/gp4niI66TK/YUX526ZvCMh3EXQkC2jyctqz2A6pvleGegLNCDmRFKwgQgLNrEtDFbLwdVTqsQ+CSviEn5qFOaG8/Nh5KMYKMgCbIaJ83H1PklG7dKbFGn2aKqdvsC4uYtXbJxVkoW0D2afaM+xh1IEDz02TNzFBdAutC9qEVsbqX4TkyD6+m2x13Q8WnsCQPkEsPbZFpNDwhtUQyWr7rS+j7UxurYPTJQqZrt9AR1SSYbfgSvcmpILC+jnrxzxAa9HpleIMNLb/zgzC4ZFD75LBhWmiChPckU32/mZ7zrFveiNcMom6I+I+JPukbnhlvlOvxHQmRaQoIlkZeTmUAv7Z/Z6xz0h7WB8v/kZ+AhQq2UuXeE6tQaN//mEy5YwVKRHTexRRUnCtN2m50vaTwpvJzcQvdej8kybWtAITOA99e4vgUmoDDk/6rmzIfJP5o4ir+anTaE/kku8ay10ki3d3gr4+hk48aGoUKQFDXuWaAzf4mgu+lDPN9j3/RTIrysjwTtxMbQMAa3Kf15xoevyg2Kh0FdENgQ2u4s=
3636
- provider: script
37-
script: make deploy
37+
script: make deploy-tags
3838
on:
3939
tags: true
4040
condition: "$DEPLOY = yes"
41+
- provider: script
42+
script: make deploy-latest
43+
on:
44+
branch: master
45+
condition: "$DEPLOY = yes"

Dockerfile.slim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ ADD . /dpp/
88

99
RUN pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
1010
RUN pip install -U /dpp/[speedup] && \
11-
mkdir -p /var/redis && chmod 775 /var/redis && chown redis.redis /var/redis
11+
mkdir -p /var/redis && chmod 775 /var/redis && chown redis.redis /var/redis && \
12+
mkdir -p /var/log/redis && cd /etc && ln -s redis/redis.conf
1213

1314
ENV DPP_NUM_WORKERS=4
1415
ENV DPP_REDIS_HOST=127.0.0.1

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ build:
4646
docker build -t frictionlessdata/datapackage-pipelines:${VERSION}-slim -f Dockerfile.slim --cache-from frictionlessdata/datapackage-pipelines:latest-slim .
4747

4848

49-
deploy:
49+
deploy-latest:
5050
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" &&\
5151
docker push frictionlessdata/datapackage-pipelines:latest &&\
5252
docker push frictionlessdata/datapackage-pipelines:latest-alpine &&\
53-
docker push frictionlessdata/datapackage-pipelines:latest-slim &&\
53+
docker push frictionlessdata/datapackage-pipelines:latest-slim
54+
55+
deploy-tags:
56+
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" &&\
5457
docker push frictionlessdata/datapackage-pipelines:${VERSION} &&\
5558
docker push frictionlessdata/datapackage-pipelines:${VERSION}-alpine &&\
5659
docker push frictionlessdata/datapackage-pipelines:${VERSION}-slim

0 commit comments

Comments
 (0)