hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-14 21:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up FROM --platform leftover from debugging

Browse Source
This commit is contained in:
Simon Li
2023-05-06 12:09:43 +01:00
parent f60c633320
commit 83a8552a63
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@@ -30,9 +30,9 @@ ARG BASE_IMAGE=ubuntu:22.04
###################################################################### ######################################################################
# A base image for building wheels # The JupyterHub wheel is pure Python so can be built once for all
# FROM --platform=${TARGETPLATFORM:-linux/amd64} $BASE_IMAGE AS base-builder # platform on the native architecture
FROM --platform=linux/amd64 $BASE_IMAGE AS jupyterhub-builder FROM --platform=${BUILDPLATFORM:-linux/amd64} $BASE_IMAGE AS jupyterhub-builder
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@@ -64,12 +64,6 @@ WORKDIR /src/jupyterhub
COPY . . COPY . .
######################################################################
# The JupyterHub wheel is pure Python so can be built once on any architecture
# TODO: re-enable BUILDPLATFORM instead of forcing to linux/amd64
#FROM --platform=${BUILDPLATFORM:-linux/amd64} base-builder AS jupyterhub-builder
# FROM --platform=linux/amd64 base-builder AS jupyterhub-builder
# Need ARG to be able to view values # Need ARG to be able to view values
# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
ARG BUILDPLATFORM ARG BUILDPLATFORM
@@ -85,7 +79,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
###################################################################### ######################################################################
# All other wheels required by JupyterHub, some are platform specific # All other wheels required by JupyterHub, some are platform specific
FROM --platform=${TARGETPLATFORM:-linux/amd64} $BASE_IMAGE AS wheel-builder FROM $BASE_IMAGE AS wheel-builder
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@@ -111,7 +105,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
###################################################################### ######################################################################
# The final JupyterHub image, platform specific # The final JupyterHub image, platform specific
FROM --platform=${TARGETPLATFORM:-linux/amd64} $BASE_IMAGE AS jupyterhub FROM $BASE_IMAGE AS jupyterhub
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
SHELL=/bin/bash \ SHELL=/bin/bash \