Merge pull request #6246 from shaneknapp/move-edx-image-repo

[DH-301] preparing to move edx to its own image repo
berkeley-dsep-infra · Sep 24, 2024 · f0da689 · f0da689
2 parents 48bded7 + e93ccdc
commit f0da689
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 222 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -205,12 +205,6 @@ jobs:
             hubploy deploy --timeout 30m dlab hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy edx
-          command: |
-            hubploy deploy --timeout 30m edx hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy highschool hub
           command: |
@@ -267,15 +261,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: edx
-          name: edx image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
 
   deploy:
     jobs:
@@ -306,15 +291,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: edx
-          name: edx image build
-          push: true
-          # Filters can only be per-job? wtf
-          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
@@ -324,7 +300,6 @@ workflows:
               - data8 image build
               - data100 image build
               - datahub image build
-              - edx image build
 
           filters:
             branches:

diff --git a/deployments/edx/hubploy.yaml b/deployments/edx/hubploy.yaml
@@ -1,12 +1,6 @@
 images:
   images:
-    - name: gcr.io/data8x-scratch/edx-user-image
-      path: image/
-  registry:
-    provider: gcloud
-    gcloud:
-      project: data8x-scratch
-      service_key: gcloud-service-key.json
+    - name: us-central1-docker.pkg.dev/data8x-scratch/user-images/edx-user-image:PLACEHOLDER
 
 cluster:
   provider: gcloud

diff --git a/deployments/edx/image/README.md b/deployments/edx/image/README.md
@@ -0,0 +1,5 @@
+# edx Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/edx-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/edx-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/edx/image/apt.txt b/deployments/edx/image/apt.txt
diff --git a/deployments/edx/image/environment.yml b/deployments/edx/image/environment.yml
diff --git a/deployments/edx/image/infra-requirements.txt b/deployments/edx/image/infra-requirements.txt
diff --git a/deployments/edx/image/ipython_config.py b/deployments/edx/image/ipython_config.py
diff --git a/deployments/edx/image/overrides.json b/deployments/edx/image/overrides.json
diff --git a/deployments/edx/image/postBuild b/deployments/edx/image/postBuild
diff --git a/scripts/user-image-management/repos.txt b/scripts/user-image-management/repos.txt
@@ -6,6 +6,7 @@ [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
 [email protected]:berkeley-dsep-infra/dev-secondary-image.git
+[email protected]:berkeley-dsep-infra/edx-user-image.git
 [email protected]:berkeley-dsep-infra/eecs-user-image.git
 [email protected]:berkeley-dsep-infra/ischool-user-image.git
 [email protected]:berkeley-dsep-infra/julia-user-image.git