From 3844877d6fba966af3233cc076a15288a9d74a08 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Wed, 4 Sep 2024 11:12:36 -0700 Subject: [PATCH] moving nature to own repo --- .circleci/config.yml | 25 ------------ deployments/nature/hubploy.yaml | 10 +---- deployments/nature/image/README.md | 5 +++ deployments/nature/image/apt.txt | 52 ------------------------ deployments/nature/image/environment.yml | 37 ----------------- deployments/nature/image/postBuild | 6 --- deployments/nature/image/start | 5 --- 7 files changed, 6 insertions(+), 134 deletions(-) create mode 100644 deployments/nature/image/README.md delete mode 100644 deployments/nature/image/apt.txt delete mode 100644 deployments/nature/image/environment.yml delete mode 100644 deployments/nature/image/postBuild delete mode 100644 deployments/nature/image/start diff --git a/.circleci/config.yml b/.circleci/config.yml index 396b89b7b..1fbf679e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -289,12 +289,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: | @@ -472,15 +466,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 @@ -645,15 +630,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 @@ -701,7 +677,6 @@ workflows: - ischool image build - julia hub image build # - logodev image build - - nature image build - publichealth image build - shiny image build diff --git a/deployments/nature/hubploy.yaml b/deployments/nature/hubploy.yaml index 1ae5a7106..8d113552d 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:anything 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 "$@"