diff --git a/.circleci/config.yml b/.circleci/config.yml index 396b89b7b..78b4ba048 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,12 +181,6 @@ jobs: command: | gcloud components install gke-gcloud-auth-plugin - - run: - name: Deploy a11y - command: | - hubploy deploy --timeout 30m a11y hub ${CIRCLE_BRANCH} - no_output_timeout: 30m - - run: name: Deploy astro command: | @@ -289,12 +283,6 @@ jobs: # hubploy deploy --timeout 30m logodev hub ${CIRCLE_BRANCH} # no_output_timeout: 30m - - run: - name: Deploy nature - command: | - hubploy deploy --timeout 30m nature hub ${CIRCLE_BRANCH} - no_output_timeout: 30m - - run: name: Deploy prob140 command: | @@ -335,15 +323,6 @@ workflows: version: 2 test-build-images: jobs: - - hubploy/build-image: - deployment: a11y - name: a11y image build - # Filters can only be per-job? wtf - filters: - branches: - ignore: - - staging - - prod - hubploy/build-image: deployment: astro name: astro image build @@ -472,15 +451,6 @@ workflows: # ignore: # - staging # - prod - - hubploy/build-image: - deployment: nature - name: nature image build - # Filters can only be per-job? wtf - filters: - branches: - ignore: - - staging - - prod - hubploy/build-image: deployment: publichealth name: publichealth image build @@ -511,15 +481,6 @@ workflows: deploy: jobs: - - hubploy/build-image: - deployment: a11y - name: a11y image build - push: true - # Filters can only be per-job? wtf - filters: - branches: - only: - - staging - hubploy/build-image: deployment: astro name: astro image build @@ -645,15 +606,6 @@ workflows: # branches: # only: # - staging - - hubploy/build-image: - deployment: nature - name: nature image build - push: true - # Filters can only be per-job? wtf - filters: - branches: - only: - - staging - hubploy/build-image: deployment: publichealth name: publichealth image build @@ -686,7 +638,6 @@ workflows: # CI level, we also make prod deploys go faster! - deploy: requires: - - a11y image build - astro image build - biology image build - cee image build @@ -701,7 +652,6 @@ workflows: - ischool image build - julia hub image build # - logodev image build - - nature image build - publichealth image build - shiny image build diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml index 969ae17a5..436bc3250 100644 --- a/.github/workflows/deploy-hubs.yaml +++ b/.github/workflows/deploy-hubs.yaml @@ -100,9 +100,10 @@ jobs: if: ${{ env.DEPLOY }} run: | while read deployment; do - echo "Pretending to deploy base hub image to ${deployment} :P" + echo "Depoying base hub image to ${deployment}" hubploy --verbose deploy --timeout 30m ${deployment} hub staging - done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20) + echo + done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y) deploy-hubs-to-prod: if: github.event_name == 'push' && github.ref == 'refs/heads/prod' @@ -194,6 +195,7 @@ jobs: if: ${{ env.DEPLOY }} run: | while read deployment; do - echo "Pretending to deploy base hub image to ${deployment} :P" + echo "Deploying base hub image to ${deployment}" hubploy --verbose deploy --timeout 30m ${deployment} hub prod - done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20) + echo + done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y) diff --git a/deployments/a11y/hubploy.yaml b/deployments/a11y/hubploy.yaml index 1815bec43..995406af6 100644 --- a/deployments/a11y/hubploy.yaml +++ b/deployments/a11y/hubploy.yaml @@ -1,14 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-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/a11y-user-image:1967ba9bc53f cluster: provider: gcloud diff --git a/deployments/a11y/image/README.md b/deployments/a11y/image/README.md new file mode 100644 index 000000000..9ac9c2c81 --- /dev/null +++ b/deployments/a11y/image/README.md @@ -0,0 +1,5 @@ +# a11y Image + +This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/a11y-user-image). + +Please see [the contribution guide](https://github.com/berkeley-dsep-infra/a11y-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image. diff --git a/deployments/a11y/image/apt.txt b/deployments/a11y/image/apt.txt deleted file mode 100644 index 24dad6eac..000000000 --- a/deployments/a11y/image/apt.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Some linux packages for basic terminal work, particularly -# oriented at users new to Unix/cmd line environments. - -# installing less as more just isn't enough -less - -# Download tools -curl -wget -vim - -# for easily managing multiple repositories with one command (perl-doc -# is needed for its help pages to work) -mr -perl-doc - -# Regular build tools for compiling common stuff -build-essential - -# Dependencies for nbconvert -texlive-xetex -texlive-fonts-recommended -texlive-plain-generic -# https://github.com/berkeley-dsep-infra/datahub/issues/3719 -texlive-lang-chinese -lmodern - -# Other useful document-related tools -pandoc -latexdiff - -# Some useful git utilities use basic Ruby -ruby - -# Other niceties for command-line work and life -rsync - -# Add chromium to the a11y image for testing with pa11y -chromium-browser - diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml deleted file mode 100644 index 8723ab955..000000000 --- a/deployments/a11y/image/environment.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: a11y - -channels: -- conda-forge - -dependencies: -- python==3.11.* -- git==2.40.0 -- coverage==7.2.2 -- jupyter-archive==3.4.0 -- jupyter_server==2.7.0 -- jupyter-book==0.15.1 -- jupyter-resource-usage==0.7.1 -- jupyterhub==4.1.6 -- matplotlib==3.7.1 -- nbgitpuller==1.2.1 -- nbclassic==1.0.0 -- nbconvert==7.14.2 -- numpy==1.24.2 -- plotly==5.13.1 -- pyopenssl==23.1.0 -- requests==2.32.3 -- urllib3==2.2.2 -- websockify==0.11.0 -- pip==23.0.1 -- jupyterthemes==0.20.0 -- jupyterlab-accessible-themes==0.1.1 -- jupyterlab_pygments==0.2.2 -- pip: - #- -r infra-requirements.txt - # Upgrade separate from what everyone else uses for now - # https://github.com/berkeley-dsep-infra/datahub/issues/3693 - - notebook==7.1.0a1 - - jupyterlab==4.1.0b0 - - nbconvert-a11y==2023.12.6 - - nb2pdf==0.6.2 - - nbpdfexport==0.2.1 - - jupyterlab-a11y-checker==0.1.2 - # pulled in by ottr, if not pinned to 1.16.2, 1.16.3 causes DH-323 - - jupytext==1.16.2 - # ### - # The items below are from infra-requirements, however lab conflicts with the - # alpha notebook. - # We disable infre-requirements.txt above and manually enable some of what it - # provides below. - # ### - # Matches version in images/hub/Dockerfile diff --git a/deployments/a11y/image/infra-requirements.txt b/deployments/a11y/image/infra-requirements.txt deleted file mode 100644 index 0fb0bd930..000000000 --- a/deployments/a11y/image/infra-requirements.txt +++ /dev/null @@ -1,29 +0,0 @@ -# WARNING: Original source at scripts/infra-packages/requirements.txt -# PLEASE DO NOT EDIT ELSEWHERE -# After editing scripts/infra-packages/requirements.txt, please run -# scripts/infra-packages/sync.bash. - -# This file pins versions of notebook related python packages we want -# across all hubs. This makes sure we don't need to upgrade them -# everwhere one by one. - -# FIXME: Freeze this to get exact versions of all dependencies -notebook==7.0.7 -jupyterlab==4.0.11 -nbgitpuller==1.2.1 -jupyter-resource-usage==1.0.1 -# Matches version in images/hub/Dockerfile -jupyterhub==4.1.6 -appmode==0.8.0 -ipywidgets==8.0.7 -jupyter-tree-download==1.0.1 -git-credential-helpers==0.2 -# Measure popularity of different packages in our hubs -# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling -# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 -RISE==5.7.1 -# syncthing for dropbox-like functionality -jupyter-syncthing-proxy==1.0.3 -# jupyter archival tool for easy user downloads -jupyter-archive==3.4.0 diff --git a/deployments/a11y/image/postBuild b/deployments/a11y/image/postBuild deleted file mode 100644 index ec5f61cb1..000000000 --- a/deployments/a11y/image/postBuild +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -eux - -# install pa11y tools for DH-169 - -npm install -g pa11y-ci@3.1.0 -npm install -g pa11y@6.2.3 \ No newline at end of file diff --git a/deployments/nature/hubploy.yaml b/deployments/nature/hubploy.yaml index 1ae5a7106..61a4e283e 100644 --- a/deployments/nature/hubploy.yaml +++ b/deployments/nature/hubploy.yaml @@ -1,14 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-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/nature-user-image:9ad22965ad22 cluster: provider: gcloud diff --git a/deployments/nature/image/README.md b/deployments/nature/image/README.md new file mode 100644 index 000000000..ce36af3e8 --- /dev/null +++ b/deployments/nature/image/README.md @@ -0,0 +1,5 @@ +# nature Image + +This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/nature-user-image). + +Please see [the contribution guide](https://github.com/berkeley-dsep-infra/nature-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image. diff --git a/deployments/nature/image/apt.txt b/deployments/nature/image/apt.txt deleted file mode 100644 index a990f28e0..000000000 --- a/deployments/nature/image/apt.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Some linux packages for basic terminal work, particularly -# oriented at users new to Unix/cmd line environments. - -# installing less as more just isn't enough -less - -# Download tools -curl -wget -vim - -# for easily managing multiple repositories with one command (perl-doc -# is needed for its help pages to work) -mr -perl-doc - -# Regular build tools for compiling common stuff -build-essential - -# Dependencies for nbconvert -texlive-xetex -texlive-fonts-recommended -texlive-plain-generic -texlive-lang-chinese -lmodern - -# Other useful document-related tools -pandoc -latexdiff - -# Some useful git utilities use basic Ruby -ruby - -# Other niceties for command-line work and life -rsync - -# playwright deps https://jira-secure.berkeley.edu/browse/DH-325 -libnss3 -libnspr4 -libdbus-1-3 -libatk1.0-0 -libatk-bridge2.0-0 -libcups2 -libdrm2 -libxkbcommon0 -libatspi2.0-0 -libxcomposite1 -libxdamage1 -libxfixes3 -libxrandr2 -libgbm1 -libasound2 diff --git a/deployments/nature/image/environment.yml b/deployments/nature/image/environment.yml deleted file mode 100644 index edf33ca3b..000000000 --- a/deployments/nature/image/environment.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: nature - -channels: -- conda-forge - -dependencies: - -# Items required for basic level functionality -- gh-scoped-creds==4.1 -- git==2.46.0 -- jupyter-resource-usage=1.1.0 -- jupyterhub==4.1.6 -- jupyterlab==4.2.5 -- jupyter_server==2.14.2 -- jupyterlab-git==0.50.1 -- jupytext==1.16.4 -- nbgitpuller==1.2.1 -- notebook==7.2.2 -- python==3.11.* - -# vscode -- code-server==4.23.1 -- jupyter-vscode-proxy==0.6 - -# other packages -- altair==5.4.1 -- earthaccess==0.10.0 -- ibis-framework[pandas,duckdb]==9.3.0 -- jupyterlab-myst==2.4.2 -- leafmap==0.36.10 -- seaborn==0.13.2 -- streamlit==1.38.0 - -# pip installed packages, conda is prefered -- pip==24.2 -- pip: - - nbconvert[webpdf]==7.16.4 diff --git a/deployments/nature/image/postBuild b/deployments/nature/image/postBuild deleted file mode 100644 index f8d71f964..000000000 --- a/deployments/nature/image/postBuild +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# installing chromium browser to enable webpdf conversion using nbconvert -export PLAYWRIGHT_BROWSERS_PATH=${CONDA_DIR} -playwright install chromium diff --git a/deployments/nature/image/start b/deployments/nature/image/start deleted file mode 100644 index c3a978b7f..000000000 --- a/deployments/nature/image/start +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# See https://jira-secure.berkeley.edu/browse/DH-305 -export PLAYWRIGHT_BROWSERS_PATH=${CONDA_DIR} -exec "$@"