Merge pull request #6110 from ryanlovett/shiny-new-repo

Use new deployment configuration for shiny
berkeley-dsep-infra · Sep 6, 2024 · 40ff7a8 · 40ff7a8
2 parents 2a27b78 + fc86072
commit 40ff7a8
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 312 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -229,12 +229,6 @@ jobs:
             hubploy deploy --timeout 30m eecs hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy gradebook
-          command: |
-            hubploy deploy --timeout 30m gradebook hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy highschool hub
           command: |
@@ -277,12 +271,6 @@ jobs:
             hubploy deploy --timeout 30m r hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy shiny
-          command: |
-            hubploy deploy --timeout 30m shiny hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy workshop
           command: |
@@ -394,15 +382,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: shiny
-          name: shiny image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
 
   deploy:
     jobs:
@@ -504,15 +483,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: shiny
-          name: shiny 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
@@ -530,7 +500,6 @@ workflows:
               - julia hub image build
 #              - logodev image build
               - publichealth image build
-              - shiny image build
 
           filters:
             branches:

diff --git a/deployments/gradebook/hubploy.yaml b/deployments/gradebook/hubploy.yaml
@@ -1,12 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/shiny-image
-      path: ../shiny/image
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/shiny-image:PLACEHOLDER
 
 cluster:
   provider: gcloud

diff --git a/deployments/shiny/hubploy.yaml b/deployments/shiny/hubploy.yaml
@@ -1,12 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/shiny-image
-      path: image
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/shiny-image:PLACEHOLDER
 
 cluster:
   provider: gcloud

diff --git a/deployments/shiny/image/Dockerfile b/deployments/shiny/image/Dockerfile
diff --git a/deployments/shiny/image/class-libs.R b/deployments/shiny/image/class-libs.R
diff --git a/deployments/shiny/image/environment.yml b/deployments/shiny/image/environment.yml
diff --git a/deployments/shiny/image/file-locks b/deployments/shiny/image/file-locks
diff --git a/deployments/shiny/image/infra-requirements.txt b/deployments/shiny/image/infra-requirements.txt
diff --git a/deployments/shiny/image/install-mambaforge.bash b/deployments/shiny/image/install-mambaforge.bash
diff --git a/deployments/shiny/image/r-packages/2023-fall-stat-135.r b/deployments/shiny/image/r-packages/2023-fall-stat-135.r
diff --git a/deployments/shiny/image/r-packages/2023-spring-stat-20.r b/deployments/shiny/image/r-packages/2023-spring-stat-20.r
diff --git a/deployments/shiny/image/r-packages/2024-spring-gradebook.r b/deployments/shiny/image/r-packages/2024-spring-gradebook.r