Add gcs base image build

ORNL · May 18, 2024 · 167064b · 167064b
1 parent 2468272
commit 167064b
Showing 1 changed file with 28 additions and 28 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -239,34 +239,34 @@ build-repo:
     - docker build --build-arg DEPENDENCIES="${REGISTRY}/datafed/dependencies-${BRANCH_LOWER}:latest" --build-arg RUNTIME="${REGISTRY}/datafed/runtime-${BRANCH_LOWER}:latest" -f repository/docker/Dockerfile -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}" .
     - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
 
-          # build-gcs-base:
-          #  needs: ["build-dependencies", "build-runtime"]
-          #  stage: build
-          #  variables:
-          #    IMAGE_TAG: "datafed/gcs-base"
-          #    GIT_STRATEGY: clone
-          #  tags:
-          #    - ci-datafed-globus
-          #    - docker
-          #  rules:
-          #    - changes:
-          #        - docker/**/*
-          #        - scripts/**/*
-          #        - common/**/*
-          #        - .gitlab-ci.yml
-          #        - CMakeLists.txt
-          #        - cmake/**/*
-          #      when: on_success
-          #  script:
-          #    - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
-          #    - echo "$BRANCH_LOWER"
-          #    - source "scripts/dependency_versions.sh"
-          #    - cd "external/globus-connect-server-deploy/docker"
-          #    - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
-          #    - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
-          #    - docker build --progress plain -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}" - < "./docker-files/Dockerfile.ubuntu-20.04"
-          #    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
-          #
+build-gcs-base:
+  needs: ["build-dependencies", "build-runtime"]
+  stage: build
+  variables:
+    IMAGE_TAG: "datafed/gcs-base"
+    GIT_STRATEGY: clone
+  tags:
+    - ci-datafed-globus
+    - docker
+  rules:
+    - changes:
+        - docker/**/*
+        - scripts/**/*
+        - common/**/*
+        - .gitlab-ci.yml
+        - CMakeLists.txt
+        - cmake/**/*
+      when: on_success
+  script:
+    - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
+    - echo "$BRANCH_LOWER"
+    - source "scripts/dependency_versions.sh"
+    - cd "external/globus-connect-server-deploy/docker"
+    - git checkout "$DATAFED_GCS_SUBMODULE_VERSION"
+    - docker login "${REGISTRY}" -u "${HARBOR_USER}" -p "${HARBOR_DATAFED_GITLAB_CI_REGISTRY}"
+    - docker build --progress plain -t "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}" - < "./docker-files/Dockerfile.ubuntu-20.04"
+    - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
+
           #build-gcs:
           #  needs: ["build-dependencies", "build-runtime", "build-gcs-base"]
           #  stage: build