merging 6082/6083/6085/6086/6087/6088 to prod

.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

.github/workflows/deploy-hubs.yaml

@@ -103,7 +103,7 @@ jobs:
             echo "Depoying base hub image to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub staging
             echo
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y ugr01)
 
   deploy-hubs-to-prod:
     if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
@@ -198,4 +198,4 @@ jobs:
             echo "Deploying base hub image to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub prod
             echo
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y ugr01)

deployments/a11y/hubploy.yaml

@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:1967ba9bc53f
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:7c4cd8df980c
 
 cluster:
   provider: gcloud

deployments/dev/images/secondary/environment.yml

@@ -39,3 +39,10 @@ dependencies:
 # Install voila and voici for generating voila dashboards
 - voila==0.5.7
 - voici==0.6.1
+# Adding more data tools to make this image comprehensive
+- dash==2.17.1
+- bokeh==3.4.0
+- panel==1.4.5
+- datashader==0.16.3
+- streamlit=1.38.0
+#- jupyter-containds=0.2.2

deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml

@@ -1,12 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/primary-user-image
-      path: ../datahub/images/default
-  registry:
-    provider: gcloud
-    gcloud:
-      project: {{cookiecutter.project_name}}
-      service_key: gcr-key.json
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/primary-user-image:PLACEHOLDER
 
 cluster:
   provider: gcloud

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:d093fb974521
 
 cluster:
   provider: gcloud

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.