Merge pull request #6262 from shaneknapp/prep-data100-new-image-repo

[DH-301] prep for moving data100 user image
berkeley-dsep-infra · Sep 25, 2024 · fe92860 · fe92860
2 parents dd4df64 + 11a3586
commit fe92860
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 234 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -181,12 +181,6 @@ jobs:
           command: |
             gcloud components install gke-gcloud-auth-plugin
 
-      - run:
-          name: Deploy data100
-          command: |
-            hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy datahub
           command: |
@@ -227,15 +221,6 @@ workflows:
   version: 2
   test-build-images:
     jobs:
-      - hubploy/build-image:
-          deployment: data100
-          name: data100 image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: datahub
           # Workshop hub also uses this
@@ -249,14 +234,6 @@ workflows:
 
   deploy:
     jobs:
-      - hubploy/build-image:
-          deployment: data100
-          name: data100 image build
-          push: true
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           # workshop hub also uses this image
           deployment: datahub
@@ -273,7 +250,6 @@ workflows:
       # CI level, we also make prod deploys go faster!
       - deploy:
           requires:
-              - data100 image build
               - datahub image build
 
           filters:

diff --git a/deployments/data100/hubploy.yaml b/deployments/data100/hubploy.yaml
@@ -1,14 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image
-      path: image/
-      repo2docker:
-        base_image: docker.io/library/buildpack-deps:jammy
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:PLACEHOLDER
 
 cluster:
   provider: gcloud

diff --git a/deployments/data100/image/README.md b/deployments/data100/image/README.md
@@ -0,0 +1,5 @@
+# Data100 Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/data100-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/data100-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/data100/image/apt.txt b/deployments/data100/image/apt.txt
diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml
diff --git a/deployments/data100/image/infra-requirements.txt b/deployments/data100/image/infra-requirements.txt
diff --git a/deployments/data100/image/postBuild b/deployments/data100/image/postBuild
diff --git a/deployments/data100/image/start b/deployments/data100/image/start
diff --git a/scripts/user-image-management/repos.txt b/scripts/user-image-management/repos.txt
@@ -3,6 +3,7 @@ [email protected]:berkeley-dsep-infra/astro-user-image.git
 [email protected]:berkeley-dsep-infra/biology-user-image.git
 [email protected]:berkeley-dsep-infra/cee-user-image.git
 [email protected]:berkeley-dsep-infra/data8-user-image.git
+[email protected]:berkeley-dsep-infra/data100-user-image.git
 [email protected]:berkeley-dsep-infra/data101-user-image.git
 [email protected]:berkeley-dsep-infra/data102-user-image.git
 [email protected]:berkeley-dsep-infra/dev-primary-image.git