Skip to content

Commit d3aeffe

Browse files
committed
v2.2.1 Fix build
1 parent 1e18299 commit d3aeffe

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ version:
3737

3838
build:
3939
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 .
40+
docker build -t frictionlessdata/datapackage-pipelines:latest --cache-from frictionlessdata/datapackage-pipelines . &&\
41+
docker build -t frictionlessdata/datapackage-pipelines:latest-alpine --cache-from frictionlessdata/datapackage-pipelines . &&\
42+
docker build -t frictionlessdata/datapackage-pipelines:latest-slim -f Dockerfile.slim . &&\
43+
docker build -t frictionlessdata/datapackage-pipelines:${VERSION} --cache-from frictionlessdata/datapackage-pipelines . &&\
44+
docker build -t frictionlessdata/datapackage-pipelines:${VERSION}-alpine --cache-from frictionlessdata/datapackage-pipelines . &&\
45+
docker build -t frictionlessdata/datapackage-pipelines:${VERSION}-slim -f Dockerfile.slim .
4646

4747
# docker pull frictionlessdata/datapackage-pipelines:latest-slim &&\
4848
# docker build -t datapackage-pipelines:latest-slim -f Dockerfile.slim --cache-from frictionlessdata/datapackage-pipelines:latest-slim . &&\
@@ -51,4 +51,9 @@ build:
5151

5252
deploy:
5353
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" &&\
54-
docker push
54+
docker push frictionlessdata/datapackage-pipelines:latest &&\
55+
docker push frictionlessdata/datapackage-pipelines:latest-alpine &&\
56+
docker push frictionlessdata/datapackage-pipelines:latest-slim &&\
57+
docker push frictionlessdata/datapackage-pipelines:${VERSION} &&\
58+
docker push frictionlessdata/datapackage-pipelines:${VERSION}-alpine &&\
59+
docker push frictionlessdata/datapackage-pipelines:${VERSION}-slim

datapackage_pipelines/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0
1+
2.2.1

tests/docker/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
sudo rm -rf tests/docker/data
44

5-
! docker run -v `pwd`/tests/docker:/pipelines:rw datapackage-pipelines run ./test \
5+
! docker run -v `pwd`/tests/docker:/pipelines:rw frictionlessdata/datapackage-pipelines run ./test \
66
&& echo failed to run docker && exit 1
77

88
! ls -lah tests/docker/data/datapackage.json tests/docker/data/test.csv \
99
&& echo failed to find output files from docker run && exit 1
1010

1111
sudo rm -rf tests/docker/data
1212

13-
! docker run -d --name dpp -v `pwd`/tests/docker:/pipelines:rw datapackage-pipelines server-reload \
13+
! docker run -d --name dpp -v `pwd`/tests/docker:/pipelines:rw frictionlessdata/datapackage-pipelines server-reload \
1414
&& echo failed to start daemonized docker container && exit 1
1515

1616
for i in 1 2 3 4 5 6 7 8 9; do

0 commit comments

Comments
 (0)