Skip to content

Commit

Permalink
Get rid of the pangeo-forge image
Browse files Browse the repository at this point in the history
No longer needed as of
pangeo-forge/pangeo-forge-runner#90!

This simplifies pangeo-forge maintenance as well, as we no
longer have to match versions of python and apache_beam with
whatever is going on here.
  • Loading branch information
yuvipanda committed Sep 13, 2023
1 parent df4252f commit 57a8d77
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 11,986 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
strategy:
fail-fast: false
matrix:
IMAGE: [base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook, forge]
IMAGE: [base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook]
name: ${{ matrix.IMAGE }}
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CondaLock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
IMAGE: [base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook, forge]
IMAGE: [base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook]
name: ${{ matrix.IMAGE }}
runs-on: ubuntu-latest
timeout-minutes: 20
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
IMAGE: [base-image, base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook, forge]
IMAGE: [base-image, base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook]
name: ${{ matrix.IMAGE }}
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -74,4 +74,4 @@ jobs:
- name: Push Tags To Quay.io
run: |
docker push quay.io/${DOCKER_ORG}/${{ matrix.IMAGE }}:latest
docker push quay.io/${DOCKER_ORG}/${{ matrix.IMAGE }}:${TAG}
docker push quay.io/${DOCKER_ORG}/${{ matrix.IMAGE }}:${TAG}
2 changes: 1 addition & 1 deletion .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
IMAGE: [base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook, forge]
IMAGE: [base-notebook, pangeo-notebook, ml-notebook, pytorch-notebook]
name: ${{ matrix.IMAGE }}
runs-on: ubuntu-latest
services:
Expand Down
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Makefile for convenience, (doesn't look for command outputs)
.PHONY: all
all: base-image base-notebook pangeo-notebook ml-notebook pytorch-notebook forge
all: base-image base-notebook pangeo-notebook ml-notebook pytorch-notebook
TESTDIR=/srv/test

.PHONY: base-image
Expand Down Expand Up @@ -39,11 +39,3 @@ pytorch-notebook : base-image
../generate-packages-list.py conda-linux-64.lock > packages.txt; \
docker build -t pangeo/pytorch-notebook:master . ; \
docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) pangeo/pytorch-notebook:master ./run_tests.sh pytorch-notebook

.PHONY: forge
forge : base-image
cd forge; \
conda-lock lock --mamba -k explicit -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64; \
../generate-packages-list.py conda-linux-64.lock > packages.txt; \
docker build -t pangeo/forge:master . ; \
docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) pangeo/forge:master ./run_tests.sh forge
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Images are hosted on [DockerHub](https://hub.docker.com/u/pangeo) and on [Quay.i
| [pangeo-notebook](pangeo-notebook/packages.txt) | base-notebook + core earth science analysis packages | ![](https://img.shields.io/docker/image-size/pangeo/pangeo-notebook?sort=date) | ![](https://img.shields.io/docker/pulls/pangeo/pangeo-notebook?sort=date)
| [pytorch-notebook](pytorch-notebook/packages.txt) | pangeo-notebook + GPU-enabled pytorch | ![](https://img.shields.io/docker/image-size/pangeo/pytorch-notebook?sort=date) | ![](https://img.shields.io/docker/pulls/pangeo/pytorch-notebook?sort=date)
| [ml-notebook](ml-notebook/packages.txt) | pangeo-notebook + GPU-enabled tensorflow2 | ![](https://img.shields.io/docker/image-size/pangeo/ml-notebook?sort=date) | ![](https://img.shields.io/docker/pulls/pangeo/ml-notebook?sort=date)
| [forge](ml-notebook/packages.txt) | pangeo-notebook + [Apache Beam](https://beam.apache.org/) support| ![](https://img.shields.io/docker/image-size/pangeo/forge?sort=date) | ![](https://img.shields.io/docker/pulls/pangeo/forge?sort=date)

*Click on the image name in the table above for a current list of installed packages and versions*

Expand Down
1 change: 0 additions & 1 deletion docs/topic/environment-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ The runtime environment sets two variables by default
points to a cloud storage bucket for temporary storage. This is set
if the variable `$PANGEO_SCRATCH_PREFIX` and `JUPYTERHUB_USER`
are detected. The prefix should be like `s3://pangeo-scratch`.
This is not present in the `forge/` image.
31 changes: 0 additions & 31 deletions forge/Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion forge/apt.txt

This file was deleted.

Loading

0 comments on commit 57a8d77

Please sign in to comment.