summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2019-11-08 22:22:07 +0100
committerDimitrios Apostolou <jimis@qt.io>2019-12-05 09:13:39 +0100
commite4f9ac5607a329bae045567a339d36469bc4fff6 (patch)
treeb92a34696fec4fc76e33b125ecf24037ba32c7b2
parentb3da33310167cc86a5bd4243dabcd1956a8b9b40 (diff)
Tag the docker images as "latest"
We will use this tag in qtbase to refer to the image to run, because with the current sha1tree() tag, every minor change in the docker images requires synchronized changes between repositories. Task-number: QTBUG-79867 Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rwxr-xr-xcoin/provisioning/common/shared/testserver/docker_images.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/coin/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh
index e98183d8..1d467f7b 100755
--- a/coin/provisioning/common/shared/testserver/docker_images.sh
+++ b/coin/provisioning/common/shared/testserver/docker_images.sh
@@ -51,18 +51,20 @@ sha1tree () {
sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1
}
-# Using SHA-1 of each server context as the tag of docker images. A tag labels a
-# specific image version. It is used by docker compose file (docker-compose.yml)
-# to launch the corresponding docker containers. If one of the server contexts
-# (./apache2, ./danted, ...) gets changes, all the related compose files in
-# qtbase should be updated as well.
+# A tag labels a specific image version. In the docker compose file
+# (docker-compose.yml) that launches the containers, the tag used is
+# "latest". Here the images are also tagged with the SHA1 of each server
+# context, so if needed we can modify docker-compose.yml to launch a very
+# specific image, thus providing a way to stage backwards-incompatible changes
+# across repositories.
source "$SERVER_PATH/settings.sh"
for server in $testserver
do
context="$SERVER_PATH/$server"
- docker build -t qt-test-server-$server:$(sha1tree $context) $context
+ tag=$(sha1tree $context)
+ docker build -t qt-test-server-$server:$tag -t qt-test-server-$server:latest $context
done
docker images