balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bugfix/docker-run-dev' into 'dev'

Browse Source 
Run dev pipeline for *-run-dev branches: fix "docker push" to the next-attempt tag

See merge request ligolang/ligo!442
This commit is contained in:
Pierre-Emmanuel Wulfman 2020-02-20 17:57:02 +00:00
commit ffe0bfb428
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -121,7 +121,7 @@ build-current-docker-image:
- build-and-package-debian-10 - build-and-package-debian-10
<<: *docker <<: *docker
script: script:
- sh scripts/build_docker_image.sh - sh scripts/build_docker_image.sh next
- sh scripts/test_cli.sh - sh scripts/test_cli.sh
only: only:
- merge_requests - merge_requests
@ -134,7 +134,7 @@ build-and-publish-latest-docker-image:
dependencies: dependencies:
- build-and-package-debian-10 - build-and-package-debian-10
script: script:
- sh scripts/build_docker_image.sh - sh scripts/build_docker_image.sh $(if test "$CI_COMMIT_REF_NAME" = "dev"; then echo next; else echo next-attempt; fi)
- sh scripts/test_cli.sh - sh scripts/test_cli.sh
- echo ${LIGO_REGISTRY_PASSWORD} | docker login -u ${LIGO_REGISTRY_USER} --password-stdin - echo ${LIGO_REGISTRY_PASSWORD} | docker login -u ${LIGO_REGISTRY_USER} --password-stdin
- docker push ${LIGO_REGISTRY_IMAGE_BUILD:-ligolang/ligo}:$(if test "$CI_COMMIT_REF_NAME" = "dev"; then echo next; else echo next-attempt; fi) - docker push ${LIGO_REGISTRY_IMAGE_BUILD:-ligolang/ligo}:$(if test "$CI_COMMIT_REF_NAME" = "dev"; then echo next; else echo next-attempt; fi)

8
scripts/build_docker_image.sh
View File

@ -1,3 +1,9 @@
#!/bin/sh #!/bin/sh
set -e set -e
docker build -t "${LIGO_REGISTRY_IMAGE_BUILD:-ligolang/ligo}:next" -f ./docker/distribution/debian/distribute.Dockerfile .
if test $# -ne 1 || test "x$1" = "-h" -o "x$1" = "x--help"; then
echo "Usage: build_docker_image.sh TAG_NAME"
exit 1
fi
docker build -t "${LIGO_REGISTRY_IMAGE_BUILD:-ligolang/ligo}:$1" -f ./docker/distribution/debian/distribute.Dockerfile .