diff --git a/.github/workflows/basepackages-recurring-tag.yml b/.github/workflows/basepackages-recurring-tag.yml index 798ef63f..b5578e6a 100644 --- a/.github/workflows/basepackages-recurring-tag.yml +++ b/.github/workflows/basepackages-recurring-tag.yml @@ -37,14 +37,14 @@ jobs: - name: Build and Push JH Image run: | COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/basepackages:${GITHUB_SHA} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/basepackages:latest - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/basepackages:recurring- - docker push gcr.io/jupyterhub-docker-images/basepackages:latest - docker push gcr.io/jupyterhub-docker-images/basepackages:recurring- - docker push gcr.io/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} - docker push gcr.io/jupyterhub-docker-images/basepackages:${GITHUB_SHA} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/basepackages:${GITHUB_SHA} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/basepackages:latest + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/basepackages:recurring- + docker push pkg.dev/jupyterhub-docker-images/basepackages:latest + docker push pkg.dev/jupyterhub-docker-images/basepackages:recurring- + docker push pkg.dev/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} + docker push pkg.dev/jupyterhub-docker-images/basepackages:${GITHUB_SHA} - name: Upload Conda Env Files to Google Storage Bucket run: | diff --git a/.github/workflows/basepackages.yml b/.github/workflows/basepackages.yml index ae6a351d..6473d6e5 100644 --- a/.github/workflows/basepackages.yml +++ b/.github/workflows/basepackages.yml @@ -37,7 +37,7 @@ jobs: - name: Build and Push JH Image run: | COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/basepackages:latest - docker push gcr.io/jupyterhub-docker-images/basepackages:latest - docker push gcr.io/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/basepackages:latest + docker push pkg.dev/jupyterhub-docker-images/basepackages:latest + docker push pkg.dev/jupyterhub-docker-images/basepackages:${GITHUB_REF##*/} diff --git a/.github/workflows/mpa2065-fall-tag.yml b/.github/workflows/mpa2065-fall-tag.yml index 3964317a..918b396c 100644 --- a/.github/workflows/mpa2065-fall-tag.yml +++ b/.github/workflows/mpa2065-fall-tag.yml @@ -37,14 +37,14 @@ jobs: - name: Build and Push JH Image run: | COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/mpa2065:${GITHUB_SHA} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/mpa2065:latest - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/mpa2065:fall-2024 - docker push gcr.io/jupyterhub-docker-images/mpa2065:latest - docker push gcr.io/jupyterhub-docker-images/mpa2065:fall-2024 - docker push gcr.io/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} - docker push gcr.io/jupyterhub-docker-images/mpa2065:${GITHUB_SHA} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/mpa2065:${GITHUB_SHA} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/mpa2065:latest + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/mpa2065:fall-2024 + docker push pkg.dev/jupyterhub-docker-images/mpa2065:latest + docker push pkg.dev/jupyterhub-docker-images/mpa2065:fall-2024 + docker push pkg.dev/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} + docker push pkg.dev/jupyterhub-docker-images/mpa2065:${GITHUB_SHA} - name: Upload Conda Env Files to Google Storage Bucket run: | diff --git a/.github/workflows/mpa2065.yml b/.github/workflows/mpa2065.yml index 36be7f68..3cf7fbf3 100644 --- a/.github/workflows/mpa2065.yml +++ b/.github/workflows/mpa2065.yml @@ -38,7 +38,7 @@ jobs: - name: Build and Push JH Image run: | COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/mpa2065:latest - docker push gcr.io/jupyterhub-docker-images/mpa2065:latest - docker push gcr.io/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/mpa2065:latest + docker push pkg.dev/jupyterhub-docker-images/mpa2065:latest + docker push pkg.dev/jupyterhub-docker-images/mpa2065:${GITHUB_REF##*/} diff --git a/.github/workflows/test-j-recurring-tag.yml b/.github/workflows/test-j-recurring-tag.yml deleted file mode 100644 index 59b95da2..00000000 --- a/.github/workflows/test-j-recurring-tag.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: tag-image-test-j -on: [workflow_dispatch] - -env: - CLASS: test-j - TARGET: r_julia - SQLITE: false - PYTHON_VERSION: "3.9.17" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.5.3 - - - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.2 - with: - project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} - service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} - export_default_credentials: true - - - name: Create Julia Environment Files - if: env.TARGET == 'r_julia' - run: | - sudo --preserve-env=CLASS docker-compose up julia_build - - - name: Upload Julia Env Files to Google Storage Bucket - if: env.TARGET == 'r_julia' - run: | - gsutil cp -r requirements/classes/test-j/julia_env gs://jupyterhub-environment-files/recurring-2024/test-j/past/${GITHUB_SHA}/julia - gsutil cp -r requirements/classes/test-j/julia_env gs://jupyterhub-environment-files/recurring-2024/test-j/latest/julia - - - name: Configure Docker - run: gcloud auth configure-docker - - - name: Build and Push JH Image - run: | - COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-j:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-j:${GITHUB_SHA} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-j:latest - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-j:recurring-2024 - docker push gcr.io/jupyterhub-docker-images/test-j:latest - docker push gcr.io/jupyterhub-docker-images/test-j:recurring-2024 - docker push gcr.io/jupyterhub-docker-images/test-j:${GITHUB_REF##*/} - docker push gcr.io/jupyterhub-docker-images/test-j:${GITHUB_SHA} - - - name: Upload Conda Env Files to Google Storage Bucket - run: | - gsutil cp -r requirements/out gs://jupyterhub-environment-files/recurring-2024/test-j/past/${GITHUB_SHA}/conda - gsutil cp -r requirements/out gs://jupyterhub-environment-files/recurring-2024/test-j/latest/conda \ No newline at end of file diff --git a/.github/workflows/test-j.yml b/.github/workflows/test-j.yml deleted file mode 100644 index 1bfcb37d..00000000 --- a/.github/workflows/test-j.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: build-image-test-j -on: - push: - paths: - - 'requirements/classes/test-j/**' - - 'Dockerfile' - - 'docker-compose.yml' - - 'scripts/**' - - '.github/workflows/test-j.yml' - workflow_dispatch: - -env: - CLASS: test-j - TARGET: r_julia - SQLITE: false - PYTHON_VERSION: "3.9.17" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.5.3 - - - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.2 - with: - project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} - service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} - export_default_credentials: true - - - name: Create Julia Environment Files - if: env.TARGET == 'r_julia' - run: | - sudo --preserve-env=CLASS docker-compose up julia_build - - - name: Configure Docker - run: gcloud auth configure-docker - #- uses: satackey/action-docker-layer-caching@v0.0.11 - # # Ignore the failure of a step and avoid terminating the job. - # continue-on-error: true - - name: Build and Push JH Image - run: | - COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-j:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-j:latest - docker push gcr.io/jupyterhub-docker-images/test-j:latest - docker push gcr.io/jupyterhub-docker-images/test-j:${GITHUB_REF##*/} diff --git a/.github/workflows/test-r-recurring-tag.yml b/.github/workflows/test-r-recurring-tag.yml deleted file mode 100644 index ee0fd64a..00000000 --- a/.github/workflows/test-r-recurring-tag.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: tag-image-test-r -on: [workflow_dispatch] - -env: - CLASS: test-r - TARGET: r_julia - SQLITE: false - PYTHON_VERSION: "3.9.17" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.5.3 - - - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.2 - with: - project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} - service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} - export_default_credentials: true - - - name: Create Julia Environment Files - if: env.TARGET == 'r_julia' - run: | - sudo --preserve-env=CLASS docker-compose up julia_build - - - name: Upload Julia Env Files to Google Storage Bucket - if: env.TARGET == 'r_julia' - run: | - gsutil cp -r requirements/classes/test-r/julia_env gs://jupyterhub-environment-files/recurring-2024/test-r/past/${GITHUB_SHA}/julia - gsutil cp -r requirements/classes/test-r/julia_env gs://jupyterhub-environment-files/recurring-2024/test-r/latest/julia - - - name: Configure Docker - run: gcloud auth configure-docker - - - name: Build and Push JH Image - run: | - COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-r:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-r:${GITHUB_SHA} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-r:latest - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-r:recurring-2024 - docker push gcr.io/jupyterhub-docker-images/test-r:latest - docker push gcr.io/jupyterhub-docker-images/test-r:recurring-2024 - docker push gcr.io/jupyterhub-docker-images/test-r:${GITHUB_REF##*/} - docker push gcr.io/jupyterhub-docker-images/test-r:${GITHUB_SHA} - - - name: Upload Conda Env Files to Google Storage Bucket - run: | - gsutil cp -r requirements/out gs://jupyterhub-environment-files/recurring-2024/test-r/past/${GITHUB_SHA}/conda - gsutil cp -r requirements/out gs://jupyterhub-environment-files/recurring-2024/test-r/latest/conda \ No newline at end of file diff --git a/.github/workflows/test-r.yml b/.github/workflows/test-r.yml deleted file mode 100644 index f8deb41e..00000000 --- a/.github/workflows/test-r.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: build-image-test-r -on: - push: - paths: - - 'requirements/classes/test-r/**' - - 'Dockerfile' - - 'docker-compose.yml' - - 'scripts/**' - - '.github/workflows/test-r.yml' - workflow_dispatch: - -env: - CLASS: test-r - TARGET: r_julia - SQLITE: false - PYTHON_VERSION: "3.9.17" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.5.3 - - - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.2 - with: - project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} - service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} - export_default_credentials: true - - - name: Create Julia Environment Files - if: env.TARGET == 'r_julia' - run: | - sudo --preserve-env=CLASS docker-compose up julia_build - - - name: Configure Docker - run: gcloud auth configure-docker - #- uses: satackey/action-docker-layer-caching@v0.0.11 - # # Ignore the failure of a step and avoid terminating the job. - # continue-on-error: true - - name: Build and Push JH Image - run: | - COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-r:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test-r:latest - docker push gcr.io/jupyterhub-docker-images/test-r:latest - docker push gcr.io/jupyterhub-docker-images/test-r:${GITHUB_REF##*/} diff --git a/.github/workflows/test-recurring-tag.yml b/.github/workflows/test-recurring-tag.yml deleted file mode 100644 index e56a5415..00000000 --- a/.github/workflows/test-recurring-tag.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: tag-image-test -on: [workflow_dispatch] - -env: - CLASS: test - TARGET: base - SQLITE: false - PYTHON_VERSION: "3.9.17" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.5.3 - - - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.2 - with: - project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} - service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} - export_default_credentials: true - - - name: Create Julia Environment Files - if: env.TARGET == 'r_julia' - run: | - sudo --preserve-env=CLASS docker-compose up julia_build - - - name: Upload Julia Env Files to Google Storage Bucket - if: env.TARGET == 'r_julia' - run: | - gsutil cp -r requirements/classes/test/julia_env gs://jupyterhub-environment-files/recurring-2024/test/past/${GITHUB_SHA}/julia - gsutil cp -r requirements/classes/test/julia_env gs://jupyterhub-environment-files/recurring-2024/test/latest/julia - - - name: Configure Docker - run: gcloud auth configure-docker - - - name: Build and Push JH Image - run: | - COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test:${GITHUB_SHA} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test:latest - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test:recurring-2024 - docker push gcr.io/jupyterhub-docker-images/test:latest - docker push gcr.io/jupyterhub-docker-images/test:recurring-2024 - docker push gcr.io/jupyterhub-docker-images/test:${GITHUB_REF##*/} - docker push gcr.io/jupyterhub-docker-images/test:${GITHUB_SHA} - - - name: Upload Conda Env Files to Google Storage Bucket - run: | - gsutil cp -r requirements/out gs://jupyterhub-environment-files/recurring-2024/test/past/${GITHUB_SHA}/conda - gsutil cp -r requirements/out gs://jupyterhub-environment-files/recurring-2024/test/latest/conda \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 7ea17ff0..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: build-image-test -on: - push: - paths: - - 'requirements/classes/test/**' - - 'Dockerfile' - - 'docker-compose.yml' - - 'scripts/**' - - '.github/workflows/test.yml' - workflow_dispatch: - -env: - CLASS: test - TARGET: base - SQLITE: false - PYTHON_VERSION: "3.9.17" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.5.3 - - - name: Set Up GCloud - uses: google-github-actions/setup-gcloud@v0.6.2 - with: - project_id: ${{ secrets.GCP_PROJECT_ID_JH_DOCKER }} - service_account_key: ${{ secrets.GCP_SA_KEY_JH_DOCKER }} - export_default_credentials: true - - - name: Create Julia Environment Files - if: env.TARGET == 'r_julia' - run: | - sudo --preserve-env=CLASS docker-compose up julia_build - - - name: Configure Docker - run: gcloud auth configure-docker - #- uses: satackey/action-docker-layer-caching@v0.0.11 - # # Ignore the failure of a step and avoid terminating the job. - # continue-on-error: true - - name: Build and Push JH Image - run: | - COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/test:latest - docker push gcr.io/jupyterhub-docker-images/test:latest - docker push gcr.io/jupyterhub-docker-images/test:${GITHUB_REF##*/} diff --git a/README.md b/README.md index df90caa7..847a7cb6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ gcloud auth configure-docker ``` # example -docker run -it --rm -p 8888:8888 gcr.io/jupyterhub-docker-images/mpa2065:latest +docker run -it --rm -p 8888:8888 pkg.dev/jupyterhub-docker-images/mpa2065:latest ``` #### Environment Files diff --git a/dev/templates/class_tag.yml b/dev/templates/class_tag.yml index 8552dfc4..b37888d5 100644 --- a/dev/templates/class_tag.yml +++ b/dev/templates/class_tag.yml @@ -37,14 +37,14 @@ jobs: - name: Build and Push JH Image run: | COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/${CLASS}:${GITHUB_SHA} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/${CLASS}:latest - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/${CLASS}:${SEASON}-${YEAR} - docker push gcr.io/jupyterhub-docker-images/${CLASS}:latest - docker push gcr.io/jupyterhub-docker-images/${CLASS}:${SEASON}-${YEAR} - docker push gcr.io/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} - docker push gcr.io/jupyterhub-docker-images/${CLASS}:${GITHUB_SHA} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/${CLASS}:${GITHUB_SHA} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/${CLASS}:latest + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/${CLASS}:${SEASON}-${YEAR} + docker push pkg.dev/jupyterhub-docker-images/${CLASS}:latest + docker push pkg.dev/jupyterhub-docker-images/${CLASS}:${SEASON}-${YEAR} + docker push pkg.dev/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} + docker push pkg.dev/jupyterhub-docker-images/${CLASS}:${GITHUB_SHA} - name: Upload Conda Env Files to Google Storage Bucket run: | diff --git a/dev/templates/class_workflow.yml b/dev/templates/class_workflow.yml index 6d3dc242..beb8a9a8 100644 --- a/dev/templates/class_workflow.yml +++ b/dev/templates/class_workflow.yml @@ -38,7 +38,7 @@ jobs: - name: Build and Push JH Image run: | COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} - docker tag jupyterhub-docker-images_jh_image:latest gcr.io/jupyterhub-docker-images/${CLASS}:latest - docker push gcr.io/jupyterhub-docker-images/${CLASS}:latest - docker push gcr.io/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} + docker tag jupyterhub-docker-images_jh_image:latest pkg.dev/jupyterhub-docker-images/${CLASS}:latest + docker push pkg.dev/jupyterhub-docker-images/${CLASS}:latest + docker push pkg.dev/jupyterhub-docker-images/${CLASS}:${GITHUB_REF##*/} diff --git a/docker-compose.yml b/docker-compose.yml index 1aa32baf..153753d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: context: . target: ${TARGET} cache_from: - - gcr.io/jupyterhub-docker-images/${CLASS}:latest + - pkg.dev/jupyterhub-docker-images/${CLASS}:latest args: CLASS: ${CLASS} SQLITE: ${SQLITE:-false} diff --git a/requirements/classes/test-j/condarc b/requirements/classes/test-j/condarc deleted file mode 100644 index d2a82925..00000000 --- a/requirements/classes/test-j/condarc +++ /dev/null @@ -1,15 +0,0 @@ -# channel locations. These override conda defaults, i.e., conda will -# search *only* the channels listed here, in the order given. -# Use "defaults" to automatically include all default channels. -# Non-url channels will be interpreted as Anaconda.org usernames -# (this can be changed by modifying the channel_alias key; see below). -# The default is just 'defaults'. -channels: - - conda-forge - -# Show channel URLs when displaying what is going to be downloaded -# and in 'conda list'. The default is False. -show_channel_urls: True - -# For more information about this file see: -# https://conda.io/docs/user-guide/configuration/use-condarc.html \ No newline at end of file diff --git a/requirements/classes/test-j/packages.R b/requirements/classes/test-j/packages.R deleted file mode 100644 index e1dced38..00000000 --- a/requirements/classes/test-j/packages.R +++ /dev/null @@ -1,12 +0,0 @@ -# Use this script to install packages via CRAN, for example: - -# NOTE: Code below shows how you install R packages from CRAN and Bioconductor. For CRAN packages, you can use -# the standard install.packages() function; for Bioconductor packages, however, you -# must first install BiocManager and then use that for installs. - -# install.packages("BiocManager", dependencies=TRUE, repos='http://cran.rstudio.com/') -# install.packages(c("ggplot2", "pheatmap", "RColorBrewer", "PoiClaClu", -# "patchwork", "tidyr", "GGally"), dependencies=TRUE, -# repos='http://cran.rstudio.com/') -# BiocManager::install(c("airway", "DESeq2", "vsn", "biomaRt", -# "AnnotationHub", "SummarizedExperiment")) diff --git a/requirements/classes/test-j/requirements.jl b/requirements/classes/test-j/requirements.jl deleted file mode 100644 index 87635a43..00000000 --- a/requirements/classes/test-j/requirements.jl +++ /dev/null @@ -1,5 +0,0 @@ -const julia_packages = [ - "IJulia", # DO NOT REMOVE - # add class specific classes here: - - ] \ No newline at end of file diff --git a/requirements/classes/test-j/requirements.pip.txt b/requirements/classes/test-j/requirements.pip.txt deleted file mode 100644 index 43719b70..00000000 --- a/requirements/classes/test-j/requirements.pip.txt +++ /dev/null @@ -1,2 +0,0 @@ -# add class-specific classes here: - diff --git a/requirements/classes/test-j/requirements.txt b/requirements/classes/test-j/requirements.txt deleted file mode 100644 index 7901ac0e..00000000 --- a/requirements/classes/test-j/requirements.txt +++ /dev/null @@ -1,70 +0,0 @@ -# add class-specific packages here: - -# these are the scipy base packages ( YOU PROBABLY DON'T WANT TO REMOVE THESE ) -dask -pandas -numexpr -matplotlib -scipy -seaborn -scikit-learn -scikit-image -sympy -cython -patsy -statsmodels -cloudpickle -dill -numba -bokeh -sqlalchemy -hdf5 -vincent -beautifulsoup4 -protobuf -xlrd -bottleneck -pytables - -# these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia ) -# https://stat.ethz.ch/R-manual/R-devel/library/base/html/00Index.html -r-base=4.2.* -# https://github.com/topepo/caret/releases/tag/v6.0-93 -r-caret=6.* -# https://cran.r-project.org/web/packages/crayon/index.html -r-crayon=1.* -# https://cran.r-project.org/web/packages/devtools/index.html -r-devtools=2.* -# https://cran.r-project.org/web/packages/forecast/index.html -r-forecast=8.* -# https://cran.r-project.org/web/packages/hexbin/index.html -r-hexbin=1.* -# https://cran.r-project.org/web/packages/htmltools/index.html -r-htmltools=0.* -# https://cran.r-project.org/web/packages/htmlwidgets/index.html -r-htmlwidgets=1.* -# https://github.com/IRkernel/IRkernel/releases/tag/1.3.2 -r-irkernel=1.* -# https://cran.r-project.org/web/packages/nycflights13/index.html -r-nycflights13=1.* -# https://cran.r-project.org/web/packages/randomForest/index.html -r-randomforest=4.* -# https://cran.r-project.org/web/packages/RCurl/index.html -r-rcurl=1.98* -# https://cran.r-project.org/web/packages/rmarkdown/index.html -r-rmarkdown=2.* -# https://cran.r-project.org/web/packages/odbc/index.html -r-rodbc=1.* -# https://cran.r-project.org/web/packages/RSQLite/index.html -r-rsqlite=2.* -# https://cran.r-project.org/web/packages/shiny/index.html -r-shiny=1.* -# https://cran.r-project.org/web/packages/tidyverse/index.html -r-tidyverse -unixodbc=2.* -# https://cran.r-project.org/web/packages/tidymodels/index.html -r-tidymodels=1.* - -# required for environment and plugins ( DO NOT REMOVE THESE!!! ) -ipython -ipykernel diff --git a/requirements/classes/test-r/condarc b/requirements/classes/test-r/condarc deleted file mode 100644 index d2a82925..00000000 --- a/requirements/classes/test-r/condarc +++ /dev/null @@ -1,15 +0,0 @@ -# channel locations. These override conda defaults, i.e., conda will -# search *only* the channels listed here, in the order given. -# Use "defaults" to automatically include all default channels. -# Non-url channels will be interpreted as Anaconda.org usernames -# (this can be changed by modifying the channel_alias key; see below). -# The default is just 'defaults'. -channels: - - conda-forge - -# Show channel URLs when displaying what is going to be downloaded -# and in 'conda list'. The default is False. -show_channel_urls: True - -# For more information about this file see: -# https://conda.io/docs/user-guide/configuration/use-condarc.html \ No newline at end of file diff --git a/requirements/classes/test-r/packages.R b/requirements/classes/test-r/packages.R deleted file mode 100644 index e1dced38..00000000 --- a/requirements/classes/test-r/packages.R +++ /dev/null @@ -1,12 +0,0 @@ -# Use this script to install packages via CRAN, for example: - -# NOTE: Code below shows how you install R packages from CRAN and Bioconductor. For CRAN packages, you can use -# the standard install.packages() function; for Bioconductor packages, however, you -# must first install BiocManager and then use that for installs. - -# install.packages("BiocManager", dependencies=TRUE, repos='http://cran.rstudio.com/') -# install.packages(c("ggplot2", "pheatmap", "RColorBrewer", "PoiClaClu", -# "patchwork", "tidyr", "GGally"), dependencies=TRUE, -# repos='http://cran.rstudio.com/') -# BiocManager::install(c("airway", "DESeq2", "vsn", "biomaRt", -# "AnnotationHub", "SummarizedExperiment")) diff --git a/requirements/classes/test-r/requirements.jl b/requirements/classes/test-r/requirements.jl deleted file mode 100644 index 87635a43..00000000 --- a/requirements/classes/test-r/requirements.jl +++ /dev/null @@ -1,5 +0,0 @@ -const julia_packages = [ - "IJulia", # DO NOT REMOVE - # add class specific classes here: - - ] \ No newline at end of file diff --git a/requirements/classes/test-r/requirements.pip.txt b/requirements/classes/test-r/requirements.pip.txt deleted file mode 100644 index 43719b70..00000000 --- a/requirements/classes/test-r/requirements.pip.txt +++ /dev/null @@ -1,2 +0,0 @@ -# add class-specific classes here: - diff --git a/requirements/classes/test-r/requirements.txt b/requirements/classes/test-r/requirements.txt deleted file mode 100644 index 7901ac0e..00000000 --- a/requirements/classes/test-r/requirements.txt +++ /dev/null @@ -1,70 +0,0 @@ -# add class-specific packages here: - -# these are the scipy base packages ( YOU PROBABLY DON'T WANT TO REMOVE THESE ) -dask -pandas -numexpr -matplotlib -scipy -seaborn -scikit-learn -scikit-image -sympy -cython -patsy -statsmodels -cloudpickle -dill -numba -bokeh -sqlalchemy -hdf5 -vincent -beautifulsoup4 -protobuf -xlrd -bottleneck -pytables - -# these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia ) -# https://stat.ethz.ch/R-manual/R-devel/library/base/html/00Index.html -r-base=4.2.* -# https://github.com/topepo/caret/releases/tag/v6.0-93 -r-caret=6.* -# https://cran.r-project.org/web/packages/crayon/index.html -r-crayon=1.* -# https://cran.r-project.org/web/packages/devtools/index.html -r-devtools=2.* -# https://cran.r-project.org/web/packages/forecast/index.html -r-forecast=8.* -# https://cran.r-project.org/web/packages/hexbin/index.html -r-hexbin=1.* -# https://cran.r-project.org/web/packages/htmltools/index.html -r-htmltools=0.* -# https://cran.r-project.org/web/packages/htmlwidgets/index.html -r-htmlwidgets=1.* -# https://github.com/IRkernel/IRkernel/releases/tag/1.3.2 -r-irkernel=1.* -# https://cran.r-project.org/web/packages/nycflights13/index.html -r-nycflights13=1.* -# https://cran.r-project.org/web/packages/randomForest/index.html -r-randomforest=4.* -# https://cran.r-project.org/web/packages/RCurl/index.html -r-rcurl=1.98* -# https://cran.r-project.org/web/packages/rmarkdown/index.html -r-rmarkdown=2.* -# https://cran.r-project.org/web/packages/odbc/index.html -r-rodbc=1.* -# https://cran.r-project.org/web/packages/RSQLite/index.html -r-rsqlite=2.* -# https://cran.r-project.org/web/packages/shiny/index.html -r-shiny=1.* -# https://cran.r-project.org/web/packages/tidyverse/index.html -r-tidyverse -unixodbc=2.* -# https://cran.r-project.org/web/packages/tidymodels/index.html -r-tidymodels=1.* - -# required for environment and plugins ( DO NOT REMOVE THESE!!! ) -ipython -ipykernel diff --git a/requirements/classes/test/condarc b/requirements/classes/test/condarc deleted file mode 100644 index d2a82925..00000000 --- a/requirements/classes/test/condarc +++ /dev/null @@ -1,15 +0,0 @@ -# channel locations. These override conda defaults, i.e., conda will -# search *only* the channels listed here, in the order given. -# Use "defaults" to automatically include all default channels. -# Non-url channels will be interpreted as Anaconda.org usernames -# (this can be changed by modifying the channel_alias key; see below). -# The default is just 'defaults'. -channels: - - conda-forge - -# Show channel URLs when displaying what is going to be downloaded -# and in 'conda list'. The default is False. -show_channel_urls: True - -# For more information about this file see: -# https://conda.io/docs/user-guide/configuration/use-condarc.html \ No newline at end of file diff --git a/requirements/classes/test/packages.R b/requirements/classes/test/packages.R deleted file mode 100644 index e1dced38..00000000 --- a/requirements/classes/test/packages.R +++ /dev/null @@ -1,12 +0,0 @@ -# Use this script to install packages via CRAN, for example: - -# NOTE: Code below shows how you install R packages from CRAN and Bioconductor. For CRAN packages, you can use -# the standard install.packages() function; for Bioconductor packages, however, you -# must first install BiocManager and then use that for installs. - -# install.packages("BiocManager", dependencies=TRUE, repos='http://cran.rstudio.com/') -# install.packages(c("ggplot2", "pheatmap", "RColorBrewer", "PoiClaClu", -# "patchwork", "tidyr", "GGally"), dependencies=TRUE, -# repos='http://cran.rstudio.com/') -# BiocManager::install(c("airway", "DESeq2", "vsn", "biomaRt", -# "AnnotationHub", "SummarizedExperiment")) diff --git a/requirements/classes/test/requirements.jl b/requirements/classes/test/requirements.jl deleted file mode 100644 index 87635a43..00000000 --- a/requirements/classes/test/requirements.jl +++ /dev/null @@ -1,5 +0,0 @@ -const julia_packages = [ - "IJulia", # DO NOT REMOVE - # add class specific classes here: - - ] \ No newline at end of file diff --git a/requirements/classes/test/requirements.pip.txt b/requirements/classes/test/requirements.pip.txt deleted file mode 100644 index 43719b70..00000000 --- a/requirements/classes/test/requirements.pip.txt +++ /dev/null @@ -1,2 +0,0 @@ -# add class-specific classes here: - diff --git a/requirements/classes/test/requirements.txt b/requirements/classes/test/requirements.txt deleted file mode 100644 index 7901ac0e..00000000 --- a/requirements/classes/test/requirements.txt +++ /dev/null @@ -1,70 +0,0 @@ -# add class-specific packages here: - -# these are the scipy base packages ( YOU PROBABLY DON'T WANT TO REMOVE THESE ) -dask -pandas -numexpr -matplotlib -scipy -seaborn -scikit-learn -scikit-image -sympy -cython -patsy -statsmodels -cloudpickle -dill -numba -bokeh -sqlalchemy -hdf5 -vincent -beautifulsoup4 -protobuf -xlrd -bottleneck -pytables - -# these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia ) -# https://stat.ethz.ch/R-manual/R-devel/library/base/html/00Index.html -r-base=4.2.* -# https://github.com/topepo/caret/releases/tag/v6.0-93 -r-caret=6.* -# https://cran.r-project.org/web/packages/crayon/index.html -r-crayon=1.* -# https://cran.r-project.org/web/packages/devtools/index.html -r-devtools=2.* -# https://cran.r-project.org/web/packages/forecast/index.html -r-forecast=8.* -# https://cran.r-project.org/web/packages/hexbin/index.html -r-hexbin=1.* -# https://cran.r-project.org/web/packages/htmltools/index.html -r-htmltools=0.* -# https://cran.r-project.org/web/packages/htmlwidgets/index.html -r-htmlwidgets=1.* -# https://github.com/IRkernel/IRkernel/releases/tag/1.3.2 -r-irkernel=1.* -# https://cran.r-project.org/web/packages/nycflights13/index.html -r-nycflights13=1.* -# https://cran.r-project.org/web/packages/randomForest/index.html -r-randomforest=4.* -# https://cran.r-project.org/web/packages/RCurl/index.html -r-rcurl=1.98* -# https://cran.r-project.org/web/packages/rmarkdown/index.html -r-rmarkdown=2.* -# https://cran.r-project.org/web/packages/odbc/index.html -r-rodbc=1.* -# https://cran.r-project.org/web/packages/RSQLite/index.html -r-rsqlite=2.* -# https://cran.r-project.org/web/packages/shiny/index.html -r-shiny=1.* -# https://cran.r-project.org/web/packages/tidyverse/index.html -r-tidyverse -unixodbc=2.* -# https://cran.r-project.org/web/packages/tidymodels/index.html -r-tidymodels=1.* - -# required for environment and plugins ( DO NOT REMOVE THESE!!! ) -ipython -ipykernel