From 6cbb9bb1937e47271407305f40ba7bba899206b9 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 11 Sep 2024 12:58:35 -0700 Subject: [PATCH] moving eecs to its own repo --- .circleci/config.yml | 25 ------- deployments/eecs/hubploy.yaml | 10 +-- deployments/eecs/image/README.md | 5 ++ deployments/eecs/image/apt.txt | 44 ------------ deployments/eecs/image/environment.yml | 72 ------------------- deployments/eecs/image/infra-requirements.txt | 29 -------- deployments/eecs/image/postBuild | 10 --- deployments/eecs/image/start | 5 -- scripts/user-image-management/repos.txt | 1 + 9 files changed, 7 insertions(+), 194 deletions(-) create mode 100644 deployments/eecs/image/README.md delete mode 100644 deployments/eecs/image/apt.txt delete mode 100644 deployments/eecs/image/environment.yml delete mode 100644 deployments/eecs/image/infra-requirements.txt delete mode 100644 deployments/eecs/image/postBuild delete mode 100644 deployments/eecs/image/start diff --git a/.circleci/config.yml b/.circleci/config.yml index d6f6f6c01..baf7d6cec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -217,12 +217,6 @@ jobs: hubploy deploy --timeout 30m edx hub ${CIRCLE_BRANCH} no_output_timeout: 30m - - run: - name: Deploy eecs - command: | - hubploy deploy --timeout 30m eecs hub ${CIRCLE_BRANCH} - no_output_timeout: 30m - - run: name: Deploy highschool hub command: | @@ -308,15 +302,6 @@ workflows: ignore: - staging - prod - - hubploy/build-image: - deployment: eecs - name: eecs image build - # Filters can only be per-job? wtf - filters: - branches: - ignore: - - staging - - prod - hubploy/build-image: deployment: ischool name: ischool image build @@ -382,15 +367,6 @@ workflows: branches: only: - staging - - hubploy/build-image: - deployment: eecs - name: eecs image build - push: true - # Filters can only be per-job? wtf - filters: - branches: - only: - - staging - hubploy/build-image: deployment: ischool name: ischool image build @@ -420,7 +396,6 @@ workflows: - data102 image build - datahub image build - edx image build - - eecs image build - ischool image build - julia hub image build diff --git a/deployments/eecs/hubploy.yaml b/deployments/eecs/hubploy.yaml index 92d8d6243..901d1da65 100644 --- a/deployments/eecs/hubploy.yaml +++ b/deployments/eecs/hubploy.yaml @@ -1,14 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-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/eecs-user-image:PLACEHOLDER cluster: provider: gcloud diff --git a/deployments/eecs/image/README.md b/deployments/eecs/image/README.md new file mode 100644 index 000000000..e7694e0ac --- /dev/null +++ b/deployments/eecs/image/README.md @@ -0,0 +1,5 @@ +# eecs Image + +This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/eecs-user-image). + +Please see [the contribution guide](https://github.com/berkeley-dsep-infra/eecs-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image. diff --git a/deployments/eecs/image/apt.txt b/deployments/eecs/image/apt.txt deleted file mode 100644 index 6c3d13462..000000000 --- a/deployments/eecs/image/apt.txt +++ /dev/null @@ -1,44 +0,0 @@ -# installing less as more just isn't enough -less - -# For desktop environment -dbus-x11 -xfce4 -xfce4-panel -xfce4-session -xfce4-settings -xubuntu-icon-theme -xauth -# You definitely need a browser -firefox -# And a text editor -gedit -# And a terminal -xfce4-terminal -# Install JDK -default-jdk -# Qt for pyqt based exercises in our desktop environment -# https://github.com/berkeley-dsep-infra/datahub/issues/1505 -# Does not exist in Jammy # qt5-default -qtbase5-dev -qt5-qmake - -# https://github.com/berkeley-dsep-infra/datahub/issues/2535 -emacs - -# vim4ever! -vim - -# https://github.com/berkeley-dsep-infra/datahub/issues/3679 -texlive-xetex -# https://github.com/berkeley-dsep-infra/datahub/issues/3721 -texlive-fonts-recommended -texlive-plain-generic -texlive-lang-chinese - -# For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979 -zip - -# playwright deps https://jira-secure.berkeley.edu/browse/DH-325 -libnss3 -libnspr4 diff --git a/deployments/eecs/image/environment.yml b/deployments/eecs/image/environment.yml deleted file mode 100644 index bfb1fb8d0..000000000 --- a/deployments/eecs/image/environment.yml +++ /dev/null @@ -1,72 +0,0 @@ -channels: -- conda-forge - -# Almost all libraries should be added in requirements.txt -# Only libraries *not* available in PyPI should be here -dependencies: -- python=3.11.* -- nbclassic==1.0.0 - -- jupyter-server-proxy==4.2.0 -# Visual Studio Code! -- jupyter-vscode-proxy=0.1 -- code-server=4.5.2 - -- syncthing=1.18.6 - -# A linux desktop environment -- websockify # from manics channel - -# https://github.com/berkeley-dsep-infra/datahub/issues/2535 -# gcc, gdb, etc are newer in conda-forge than in apt, esp with Ubuntu focal -- c-compiler=1.4.2 -- cxx-compiler=1.4.2 -- fortran-compiler=1.4.2 -- gdb=11.2 -- libopenblas=0.3.27 -- liblapack=3.9.0 -- armadillo=9.900.5 -- gperf=3.1 -# CS 16A -# From https://github.com/berkeley-dsep-infra/datahub/issues/1363#issuecomment-598916469 -- numpy=1.26.* -- matplotlib=3.8.* -- sympy=1.12 - -# For EECS127/227a -# See https://github.com/berkeley-dsep-infra/datahub/issues/1631 -- cvxpy=1.4.3 -# See https://github.com/berkeley-dsep-infra/datahub/issues/1936 -- scikit-learn=1.4.* - -# For CHEM279 -# See https://github.com/berkeley-dsep-infra/datahub/issues/2717 -- git=2.33.0 - -# From https://github.com/berkeley-dsep-infra/datahub/issues/1505 -- Pillow=10.3.0 - -# For ELENG 120 https://github.com/berkeley-dsep-infra/datahub/issues/3566 -- scipy=1.11.3 -- gcc=10.4.0 - -# https://github.com/berkeley-dsep-infra/datahub/issues/4460 -- sk-video=1.1.10 -- ffmpeg=5.1.2 - -# https://github.com/berkeley-dsep-infra/datahub/issues/4708 -- datascience==0.17.6 - -- pip -- pip: -# From https://github.com/berkeley-dsep-infra/datahub/issues/1639 - - opencv-python==4.9.0.80 - - PyQt5==5.15.4 -# From https://github.com/berkeley-dsep-infra/datahub/issues/1363#issuecomment-598916469 - - lcapy==0.96 -# make webpdf export work DH-326 - - nbconvert[webpdf]==7.16.4 -# For desktop environment - - jupyter-desktop-server==0.1.3 - - -r infra-requirements.txt - - otter-grader==3.1.4 diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt deleted file mode 100644 index 0fb0bd930..000000000 --- a/deployments/eecs/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/eecs/image/postBuild b/deployments/eecs/image/postBuild deleted file mode 100644 index b1b290345..000000000 --- a/deployments/eecs/image/postBuild +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# 2024-01-13 sknapp: incompatible due to notebook 7 -# jupyter contrib nbextensions install --sys-prefix --symlink -# jupyter nbextensions_configurator enable --sys-prefix - -# installing chromium browser to enable webpdf conversion using nbconvert -export PLAYWRIGHT_BROWSERS_PATH=${CONDA_DIR} -playwright install chromium diff --git a/deployments/eecs/image/start b/deployments/eecs/image/start deleted file mode 100644 index c3a978b7f..000000000 --- a/deployments/eecs/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 "$@" diff --git a/scripts/user-image-management/repos.txt b/scripts/user-image-management/repos.txt index 439173a4b..78f88aff0 100644 --- a/scripts/user-image-management/repos.txt +++ b/scripts/user-image-management/repos.txt @@ -5,6 +5,7 @@ git@github.com:berkeley-dsep-infra/cee-user-image.git git@github.com:berkeley-dsep-infra/data101-user-image.git git@github.com:berkeley-dsep-infra/dev-primary-image.git git@github.com:berkeley-dsep-infra/dev-secondary-image.git +git@github.com:berkeley-dsep-infra/eecs-user-image.git git@github.com:berkeley-dsep-infra/logodev-user-image.git git@github.com:berkeley-dsep-infra/nature-user-image.git git@github.com:berkeley-dsep-infra/publichealth-user-image.git