diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bf78249e7815c5bc2c4fbe13fba3cf9a76d11f1..73f9b0f12148b9a04f276180c2164a214eba6128 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -282,4 +282,4 @@ wheel_packaging: - pip3 install -r docker-compose/itango/lofar-requirements.txt script: - cd tangostationcontrol - - python setup.py bdist_wheel \ No newline at end of file + - python setup.py bdist_wheel diff --git a/docker-compose/README.md b/docker-compose/README.md index 250a435efb526ed7dd9a9bee723f5444caeced3b..13f26446c5be59c624b8c77b8c978a708d716d9d 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -50,8 +50,7 @@ docker-compose directory corresponds to one image. ### Gitlab CI phases -The building and pushing of docker images is performed in two separate phases. -This is because certain stages will depend on the presence of the base images. -The base images will run as first +Docker images are build and pushed in two stages. First external images are +downloaded, retagged and pushed to our own registry. -`git diff --name-only HEAD~1..HEAD ./` \ No newline at end of file +`git diff --name-only HEAD~1..HEAD ./` diff --git a/sbin/tag_and_push_docker_image.sh b/sbin/tag_and_push_docker_image.sh index d38685b846164ce03cbf1c89e24a380f926268b5..12af4e4786cabf7fc03d97f2bb40f4aac318165d 100755 --- a/sbin/tag_and_push_docker_image.sh +++ b/sbin/tag_and_push_docker_image.sh @@ -121,4 +121,4 @@ if [ ! -z "${1+x}" ] && [ "${1}" == "pull" ]; then fi # Someone nothing ran, that is an error do not fail silently -exit 1 \ No newline at end of file +exit 1