Skip to content

Commit c6de3a1

Browse files
committed
v2.1.16 Build slim-based docker image
1 parent 8cefe58 commit c6de3a1

File tree

4 files changed

+47
-5
lines changed

4 files changed

+47
-5
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ env:
1111
- TOXENV="py37-plyvel" SPEEDUP=yes DEPLOY=yes
1212
global:
1313
- LANG=en_US.UTF-8
14+
- secure: aALDdU5nRkFycaj7ITbI0XoLvuKvTADylylE9eCRIzRyR2ObmwMgCnikA8G+44Q3VSZJxZNu0mpedWKUv3yNqxYj9KFfMmHI4vGDD/ZSwp3rBe//uXUUm2dUoTTDi+NhdeUJfvSkGlPCDg7LYUIoj4LnZhcIN3pHH0UWjEfQOO/tIbpKs3bQB/VVe4H7BobtWxIEHDESBGrTYEEwJWG4DGULmC6tV6czwqLT5xtgQ3A/UrbEdfOdhgt+eZC2dGDgvIanz7S9Bpkj56m1cmgKvVDF8kv32wnKH8BMTssC9VCF2dNPX1QagnIuXF1LYBWGIc3YvIki6n+xEfGpapUZCl3pE1H3xBSX4kmeH2xb/FJwXlCdmSr6s8plFAC/IW+2+uDcNCVBd7HDorSeSqlnWjAgkjkNj7ZUcKrPtQCxm7UYm2uMPM4p+AsYEWBRilawFl1iOc3jxif04j7PdCNV19E2TGpekcZYY7OJS5fz3Ll6t3J3Hb0xVFWr8YH0zWv6SRzsYhwEiIylv/F5cuoYWEgY3xMy5BSpWCsuOhfR5BGqu4UiNKXv0Vk2Pzsewl8z1/cNf+fSvz/zOq9VOzMe/jDMA67wO/pxLa5np+bu7XgwxSljzacyT2QZt72+PDnltUylW2VLp5qW0u1xklYF2LKqynJ6ON1kioHRg25Iawg=
15+
- secure: ekU7r/E7OTJqdt+KTO2msPKIdpG+8UYTDw2BkXjn31rP5VFRt603NRrMY21q98e/aB7XbBWWr9P7yEwY+YCGtEvTxjQtHz1KKTMbazPvbOSOrfPgcGJ3zbTCY9uyUeWUFBf1bet5FzjAZ/uS8E8g7Uz7ZQfTWBQWLk+2GWxAMgPOT2WHLtFyMnXqo3DPJ75CoXBD6rsPKAMGtQd0LJ3ptIjw8aTx5d7JTnpTszMTxu2WGbaH9e4NTl3A1IGJmTrcGAiaR5LorHty1mU51A9O8mxZmr1iL+PLaIPEv4UDiMPfp0Hx3u64Xy7Kfi0Jt0VVz2JGOWq/xyIsg0TQGXvpeWoAzVflDHJ0KTv4pJvhpflhVq1ahsmr7VL+09HM9zuPASfJUhvT3d4jq7WSapPTrtb22mP0QorvX4/QY4XXfbwkGQtxbu4Q8p9JuN5vByX0POV5qhk79Q8kgZJYaIG0JyVDhkpOZYdgkavGsN3znJH7u/YQgNRCGQamqOAb02FoQIdJXL1Po0ZU31grazlROdxaKY75x9IrHeHIK+p1+b85Sj+QW3bVLgFCk3OiZ71Xt8lJeSfmZGqINwr4IZ1BTijgPbpnydYNw9Bul8u4pvJaNAYg/OJsg/oPXPL302LFpCXUXP/4t/WN9QDERbltdMRpTCS2mIZfFBDCZ5Wjd5s=
1416
install:
1517
- sudo apt-get install libleveldb-dev libleveldb1v5
1618
- if [ "${SPEEDUP}" == yes ]; then make install-speedup; else make install; fi
@@ -23,11 +25,16 @@ script:
2325
after_success:
2426
- coveralls
2527
deploy:
26-
provider: pypi
28+
- provider: pypi
2729
user: akariv
2830
distributions: sdist bdist_wheel
2931
on:
3032
tags: true
31-
condition: $DEPLOY = yes
33+
condition: "$DEPLOY = yes"
3234
password:
3335
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=
36+
- provider: script
37+
script: make deploy
38+
on:
39+
tags: true
40+
condition: "$DEPLOY = yes"

Dockerfile.slim

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM python:3.7-slim
2+
3+
RUN apt-get update && apt-get install --no-install-recommends -y redis libleveldb1d libleveldb-dev build-essential libpq-dev && \
4+
update-ca-certificates && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
6+
7+
ADD . /dpp/
8+
9+
RUN pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
10+
RUN pip install -U /dpp/[speedup] && \
11+
mkdir -p /var/redis && chmod 775 /var/redis && chown redis.redis /var/redis
12+
13+
ENV DPP_NUM_WORKERS=4
14+
ENV DPP_REDIS_HOST=127.0.0.1
15+
ENV DPP_CELERY_BROKER=redis://localhost:6379/6
16+
17+
EXPOSE 5000
18+
WORKDIR /pipelines/
19+
ENTRYPOINT ["/dpp/docker/run.sh"]
20+
21+

Makefile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,19 @@ version:
3636
@echo $(VERSION)
3737

3838
build:
39-
docker pull frictionlessdata/datapackage-pipelines &&\
40-
docker build -t datapackage-pipelines --cache-from frictionlessdata/datapackage-pipelines .
39+
docker pull frictionlessdata/datapackage-pipelines:latest &&\
40+
docker build -t datapackage-pipelines:latest --cache-from frictionlessdata/datapackage-pipelines . &&\
41+
docker build -t datapackage-pipelines:latest-alpine --cache-from frictionlessdata/datapackage-pipelines . &&\
42+
docker build -t datapackage-pipelines:latest-slim -f Dockerfile.slim . &&\
43+
docker build -t datapackage-pipelines:${VERSION} --cache-from frictionlessdata/datapackage-pipelines . &&\
44+
docker build -t datapackage-pipelines:${VERSION}-alpine --cache-from frictionlessdata/datapackage-pipelines . &&\
45+
docker build -t datapackage-pipelines:${VERSION}-slim -f Dockerfile.slim .
46+
47+
# docker pull frictionlessdata/datapackage-pipelines:latest-slim &&\
48+
# docker build -t datapackage-pipelines:latest-slim -f Dockerfile.slim --cache-from frictionlessdata/datapackage-pipelines:latest-slim . &&\
49+
# docker build -t datapackage-pipelines:${VERSION}-slim -f Dockerfile.slim --cache-from frictionlessdata/datapackage-pipelines:latest-slim .
50+
51+
52+
deploy:
53+
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" &&\
54+
docker push

datapackage_pipelines/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.15
1+
2.1.16

0 commit comments

Comments
 (0)