Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/checkout-4
Browse files Browse the repository at this point in the history
  • Loading branch information
manthey authored Oct 18, 2023
2 parents 7fcad81 + c17fe0f commit da99d38
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
with:
fetch-depth: 0
- name: Log into the Container registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: token
Expand All @@ -28,11 +28,11 @@ jobs:
# Build and publish image with all sources
- name: Extract metadata for the Docker image
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push the Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
file: slim.Dockerfile
Expand All @@ -53,7 +53,7 @@ jobs:
with:
fetch-depth: 0
- name: Log into the Container registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: token
Expand All @@ -62,14 +62,14 @@ jobs:
# Build and publish image with only geospatial sources
- name: Extract metadata for the geospatial Docker image
id: meta_target
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
flavor: |
latest=auto
suffix=-${{ matrix.target }},onlatest=true
- name: Build and push the geosptial Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
file: slim.Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build wheels
FROM python:3.9-slim as build
FROM python:3.12-slim as build

# Need git for setuptools_scm
RUN apt-get update \
Expand All @@ -19,7 +19,7 @@ RUN echo "pylibmc>=1.5.1\nmatplotlib\npyvips\nsimplejpeg\n" \


# Geospatial Sources
FROM python:3.9-slim as geo
FROM python:3.12-slim as geo
COPY --from=build /opt/build-context/wheels /opt/wheels
LABEL maintainer="Kitware, Inc. <[email protected]>"
LABEL repo="https://github.com/girder/large_image"
Expand All @@ -37,7 +37,7 @@ RUN pip install \


# All Sources
FROM python:3.9-slim as all
FROM python:3.12-slim as all
COPY --from=build /opt/build-context/wheels /opt/wheels
LABEL maintainer="Kitware, Inc. <[email protected]>"
LABEL repo="https://github.com/girder/large_image"
Expand All @@ -52,7 +52,7 @@ RUN pip install \


# All Sources and Girder Packages
FROM python:3.9-slim as girder
FROM python:3.12-slim as girder
COPY --from=build /opt/build-context/wheels /opt/wheels
LABEL maintainer="Kitware, Inc. <[email protected]>"
LABEL repo="https://github.com/girder/large_image"
Expand All @@ -65,7 +65,7 @@ RUN pip install \


# Jupyter all sources
FROM jupyter/base-notebook:python-3.9.12 as jupyter
FROM jupyter/base-notebook:python-3.11.6 as jupyter
COPY --from=build /opt/build-context/wheels /opt/wheels
LABEL maintainer="Kitware, Inc. <[email protected]>"
LABEL repo="https://github.com/girder/large_image"
Expand All @@ -83,7 +83,7 @@ ENV LARGE_IMAGE_JUPYTER_PROXY='/proxy/'


# Jupyter Geospatial sources
FROM jupyter/base-notebook:python-3.9.12 as jupyter-geo
FROM jupyter/base-notebook:python-3.11.6 as jupyter-geo
COPY --from=build /opt/build-context/wheels /opt/wheels
LABEL maintainer="Kitware, Inc. <[email protected]>"
LABEL repo="https://github.com/girder/large_image"
Expand Down

0 comments on commit da99d38

Please sign in to comment.