kopia lustrzana https://github.com/jupyterhub/repo2docker
commit
2b17eca207
|
@ -1,8 +1,8 @@
|
||||||
# syntax = docker/dockerfile:1.3
|
# syntax = docker/dockerfile:1.3
|
||||||
ARG ALPINE_VERSION=3.16
|
ARG ALPINE_VERSION=3.17
|
||||||
FROM alpine:${ALPINE_VERSION} AS builder
|
FROM alpine:${ALPINE_VERSION} AS builder
|
||||||
|
|
||||||
RUN apk add --no-cache git python3 python3-dev py3-pip build-base
|
RUN apk add --no-cache git python3 python3-dev py3-pip py3-setuptools build-base
|
||||||
|
|
||||||
# set pip's cache directory using this environment variable, and use
|
# set pip's cache directory using this environment variable, and use
|
||||||
# ARG instead of ENV to ensure its only set when the image is built
|
# ARG instead of ENV to ensure its only set when the image is built
|
||||||
|
@ -21,7 +21,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
|
||||||
FROM alpine:${ALPINE_VERSION}
|
FROM alpine:${ALPINE_VERSION}
|
||||||
|
|
||||||
# install python, git, bash, mercurial
|
# install python, git, bash, mercurial
|
||||||
RUN apk add --no-cache git git-lfs python3 py3-pip bash docker mercurial
|
RUN apk add --no-cache git git-lfs python3 py3-pip py3-setuptools bash docker mercurial
|
||||||
|
|
||||||
# repeat ARG from above
|
# repeat ARG from above
|
||||||
ARG PIP_CACHE_DIR=/tmp/pip-cache
|
ARG PIP_CACHE_DIR=/tmp/pip-cache
|
||||||
|
|
|
@ -343,10 +343,10 @@ class RBuildPack(PythonBuildPack):
|
||||||
(
|
(
|
||||||
"${NB_USER}",
|
"${NB_USER}",
|
||||||
# Install a pinned version of devtools, IRKernel and shiny
|
# Install a pinned version of devtools, IRKernel and shiny
|
||||||
r"""
|
rf"""
|
||||||
EXPANDED_CRAN_MIRROR_URL="$(. /etc/os-release && echo {self.devtools_cran_mirror_url()} | envsubst)" && \
|
export EXPANDED_CRAN_MIRROR_URL="$(. /etc/os-release && echo {cran_mirror_url} | envsubst)" && \
|
||||||
R --quiet -e "install.packages(c('devtools', 'IRkernel', 'shiny'), repos='${{EXPANDED_CRAN_MIRROR_URL}}')" && \
|
R --quiet -e "install.packages(c('devtools', 'IRkernel', 'shiny'), repos=Sys.getenv(\"EXPANDED_CRAN_MIRROR_URL\"))" && \
|
||||||
R --quiet -e "IRkernel::installspec(prefix='$NB_PYTHON_PREFIX')"
|
R --quiet -e "IRkernel::installspec(prefix=Sys.getenv(\"NB_PYTHON_PREFIX\"))"
|
||||||
""",
|
""",
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -45,10 +45,10 @@ class Git(ContentProvider):
|
||||||
self.log.error(
|
self.log.error(
|
||||||
f"Failed to check out ref {ref}", extra=dict(phase=R2dState.FAILED)
|
f"Failed to check out ref {ref}", extra=dict(phase=R2dState.FAILED)
|
||||||
)
|
)
|
||||||
if ref == "master":
|
if ref == "master" or ref == "main":
|
||||||
msg = (
|
msg = (
|
||||||
"Failed to check out the 'master' branch. "
|
f"Failed to check out the '{ref}' branch. "
|
||||||
"Maybe the default branch is not named 'master' "
|
f"Maybe the default branch is not named '{ref}' "
|
||||||
"for this repository.\n\nTry not explicitly "
|
"for this repository.\n\nTry not explicitly "
|
||||||
"specifying `--ref`."
|
"specifying `--ref`."
|
||||||
)
|
)
|
||||||
|
|
|
@ -12,12 +12,12 @@
|
||||||
# Test that a full remote/ref works
|
# Test that a full remote/ref works
|
||||||
- name: Binder Examples - Requirements
|
- name: Binder Examples - Requirements
|
||||||
url: https://github.com/binder-examples/requirements
|
url: https://github.com/binder-examples/requirements
|
||||||
ref: origin/master
|
ref: origin/main
|
||||||
verify: python -c 'import matplotlib'
|
verify: python -c 'import matplotlib'
|
||||||
# Test that ref is added to branch if not present
|
# Test that ref is added to branch if not present
|
||||||
- name: Binder Examples - Requirements
|
- name: Binder Examples - Requirements
|
||||||
url: https://github.com/binder-examples/requirements
|
url: https://github.com/binder-examples/requirements
|
||||||
ref: master
|
ref: main
|
||||||
verify: python -c 'import matplotlib'
|
verify: python -c 'import matplotlib'
|
||||||
# Test that tags work + ref is added to tag if not present
|
# Test that tags work + ref is added to tag if not present
|
||||||
- name: Binder Examples - Requirements
|
- name: Binder Examples - Requirements
|
||||||
|
|
Ładowanie…
Reference in New Issue