moving ugr01 to its own image repo

berkeley-dsep-infra · Sep 5, 2024 · d14bcc4 · d14bcc4
1 parent a92c94b
commit d14bcc4
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 231 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -307,12 +307,6 @@ jobs:
             hubploy deploy --timeout 30m shiny hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy ugr01
-          command: |
-            hubploy deploy --timeout 30m ugr01 hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy workshop
           command: |
@@ -469,15 +463,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: ugr01
-          name: ugr01 image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
 
   deploy:
     jobs:
@@ -624,14 +609,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: ugr01
-          name: ugr01 image build
-          push: true
-          filters:
-              branches:
-                only:
-                - staging
       # Build images only during the staging deploy. All merges
       # to prod need to go via staging, so prod should *never*
       # use images not built for staging. By enforcing this at the

diff --git a/deployments/ugr01/hubploy.yaml b/deployments/ugr01/hubploy.yaml
@@ -1,14 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ugr01-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/ugr01-user-image:PLACEHOLDER
 
 cluster:
   provider: gcloud

diff --git a/deployments/ugr01/image/README.md b/deployments/ugr01/image/README.md
@@ -0,0 +1,5 @@
+# Ugr01 Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/ugr01-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/ugr01-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/ugr01/image/apt.txt b/deployments/ugr01/image/apt.txt
diff --git a/deployments/ugr01/image/environment.yml b/deployments/ugr01/image/environment.yml
diff --git a/deployments/ugr01/image/infra-requirements.txt b/deployments/ugr01/image/infra-requirements.txt
diff --git a/deployments/ugr01/image/postBuild b/deployments/ugr01/image/postBuild
diff --git a/deployments/ugr01/image/start b/deployments/ugr01/image/start