From ebd93cb29fc93fbe4a8fbdea5c7436e36d76ae0b Mon Sep 17 00:00:00 2001
From: Joshua Brown <brownjs@ornl.gov>
Date: Thu, 29 Aug 2024 11:32:41 -0400
Subject: [PATCH] Add latest tag

---
 .gitlab/build/build_gcs_base_image.yml       | 2 +-
 .gitlab/build/build_gcs_image.yml            | 2 +-
 .gitlab/build/force_build_gcs_base_image.yml | 2 +-
 .gitlab/build/force_build_gcs_image.yml      | 2 +-
 .gitlab/common.yml                           | 2 +-
 CHANGELOG.md                                 | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab/build/build_gcs_base_image.yml b/.gitlab/build/build_gcs_base_image.yml
index 7003fbb0..1ec2e47a 100644
--- a/.gitlab/build/build_gcs_base_image.yml
+++ b/.gitlab/build/build_gcs_base_image.yml
@@ -31,7 +31,7 @@ build-gcs-base:
     - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
     - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
     - docker build --progress plain -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" - < "./docker-files/Dockerfile.ubuntu-20.04"
-    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest"
 
 placeholder:
   extends: .placeholder
diff --git a/.gitlab/build/build_gcs_image.yml b/.gitlab/build/build_gcs_image.yml
index 20ceb47f..46f05a72 100644
--- a/.gitlab/build/build_gcs_image.yml
+++ b/.gitlab/build/build_gcs_image.yml
@@ -30,7 +30,7 @@ build-gcs:
     - ./scripts/generate_datafed.sh
     - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
     - docker build --build-arg DEPENDENCIES="${REGISTRY}/datafed/dependencies-${BRANCH_LOWER}:latest" --build-arg RUNTIME="${REGISTRY}/datafed/runtime-${BRANCH_LOWER}:latest" --build-arg GCS_IMAGE="${REGISTRY}/datafed/gcs-base-${BRANCH_LOWER}:latest" -f repository/docker/Dockerfile.gcs -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" .
-    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest"
 
 placeholder:
   extends: .placeholder
diff --git a/.gitlab/build/force_build_gcs_base_image.yml b/.gitlab/build/force_build_gcs_base_image.yml
index 924250b8..d75bce42 100644
--- a/.gitlab/build/force_build_gcs_base_image.yml
+++ b/.gitlab/build/force_build_gcs_base_image.yml
@@ -19,4 +19,4 @@ build-gcs-base:
     - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
     - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
     - docker build --progress plain -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" - < "./docker-files/Dockerfile.ubuntu-20.04"
-    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest"
diff --git a/.gitlab/build/force_build_gcs_image.yml b/.gitlab/build/force_build_gcs_image.yml
index 7f0175f7..f1e8c795 100644
--- a/.gitlab/build/force_build_gcs_image.yml
+++ b/.gitlab/build/force_build_gcs_image.yml
@@ -16,4 +16,4 @@ build-gcs:
     - ./scripts/generate_datafed.sh
     - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
     - docker build --build-arg DEPENDENCIES="${REGISTRY}/datafed/dependencies-${BRANCH_LOWER}:latest" --build-arg RUNTIME="${REGISTRY}/datafed/runtime-${BRANCH_LOWER}:latest" --build-arg GCS_IMAGE="${REGISTRY}/datafed/gcs-base-${BRANCH_LOWER}:latest" -f repository/docker/Dockerfile.gcs -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" .
-    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest"
diff --git a/.gitlab/common.yml b/.gitlab/common.yml
index b517109e..50f90e2c 100644
--- a/.gitlab/common.yml
+++ b/.gitlab/common.yml
@@ -44,7 +44,7 @@
     - ./scripts/generate_datafed.sh
     - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY_TOKEN}"
     - docker build --build-arg DEPENDENCIES="${REGISTRY}/datafed/dependencies-${BRANCH_LOWER}:latest" --build-arg RUNTIME="${REGISTRY}/datafed/runtime-${BRANCH_LOWER}:latest" -f ${DOCKER_FILE_PATH} -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest" .
-    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}:latest"
 
 .error_logs_client_end_to_end:
   stage: log
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82529df8..3f5f9ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
 18. [995] - Fixes issue with project and user folders in repo being created under root user permissions.
 19. [994] - Fixes issue with spaces not being preserved in shell scripts from docker compose .env file.
 20. [996] - Fixes bug in lego install script where function name had additional s
+21. [998] - Fixing missing :latest tag on push in container, in common.yml of ci files
 
 # v2023.10.23.15.50