Merge branch 'main' into feat/new-base

Author: yuvipanda

.github/workflows/release.yml

@@ -55,7 +55,7 @@ jobs:
       # all previous steps always run in order to exercise them
       - name: Publish distribution to PyPI
         if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@v1.5.1
+        uses: pypa/gh-action-pypi-publish@v1.6.4
         with:
           password: ${{ secrets.PYPI_PASSWORD }}
 
@@ -125,6 +125,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ env.TAGS }}

.pre-commit-config.yaml

@@ -11,7 +11,7 @@
 repos:
   # Autoformat: Python code, syntax patterns are modernized
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.2
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args:
@@ -23,7 +23,7 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
         args:
@@ -36,7 +36,7 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.11.4
     hooks:
       - id: isort
         args:
@@ -48,3 +48,7 @@ repos:
     hooks:
       - id: prettier
         files: ".md"
+
+# pre-commit.ci config reference: https://pre-commit.ci/#configuration
+ci:
+  autoupdate_schedule: monthly

Dockerfile

@@ -1,39 +1,29 @@
 # syntax = docker/dockerfile:1.3
 ARG ALPINE_VERSION=3.17
-FROM alpine:${ALPINE_VERSION} AS builder
+FROM alpine:${ALPINE_VERSION}
 
 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
-# ARG instead of ENV to ensure its only set when the image is built
-ARG PIP_CACHE_DIR=/tmp/pip-cache
-
 # build wheels in first image
 ADD . /tmp/src
 RUN cd /tmp/src && git clean -xfd && git status
-RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
-    mkdir /tmp/wheelhouse \
+RUN mkdir /tmp/wheelhouse \
  && cd /tmp/wheelhouse \
  && pip3 install wheel \
- && pip3 wheel /tmp/src \
+ && pip3 wheel --no-cache-dir /tmp/src \
  && ls -l /tmp/wheelhouse
 
 FROM alpine:${ALPINE_VERSION}
 
 # install python, git, bash, mercurial
 RUN apk add --no-cache git git-lfs python3 py3-pip py3-setuptools bash docker mercurial
 
-# repeat ARG from above
-ARG PIP_CACHE_DIR=/tmp/pip-cache
+# install hg-evolve (Mercurial extensions)
+RUN pip3 install hg-evolve --user --no-cache-dir
 
 # install repo2docker
-# and hg-evolve (Mercurial extensions)
-# mount /tmp/wheelhouse from build stage
-# avoids extra layer when using COPY --from
-RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
-    --mount=type=cache,from=builder,source=/tmp/wheelhouse,target=/tmp/wheelhouse \
-    pip3 install --ignore-installed --no-deps /tmp/wheelhouse/*.whl \
- && pip3 install hg-evolve \
+COPY --from=0 /tmp/wheelhouse /tmp/wheelhouse
+RUN pip3 install --no-cache-dir --ignore-installed --no-deps /tmp/wheelhouse/*.whl \
  && pip3 list
 
 # add git-credential helper

docs/source/howto/user_interface.rst

@@ -97,7 +97,7 @@ http://mybinder.org/v2/gh/binder-examples/r/HEAD?urlpath=rstudio
 Shiny
 =====
 
-`Shiny lets you create interactive visualizaions with R <https://shiny.rstudio.com/>`_.
+`Shiny lets you create interactive visualizations with R <https://shiny.rstudio.com/>`_.
 Shiny is automatically enabled if a configuration file for
 R is detected (i.e. an R version specified in ``runtime.txt``). If
 this is detected, Shiny will be accessible by appending

repo2docker/app.py

@@ -15,6 +15,7 @@
 import sys
 import tempfile
 import time
+import warnings
 from urllib.parse import urlparse
 
 import entrypoints
@@ -36,7 +37,7 @@
     RBuildPack,
 )
 from .engine import BuildError, ContainerEngineException, ImageLoadError
-from .utils import ByteSpecification, R2dState, chdir
+from .utils import ByteSpecification, R2dState, chdir, get_platform
 
 
 class Repo2Docker(Application):
@@ -250,6 +251,27 @@ def _user_name_default(self):
         config=True,
     )
 
+    platform = Unicode(
+        config=True,
+        help="""
+        Platform to build for, linux/amd64 (recommended) or linux/arm64 (experimental).
+        """,
+    )
+
+    @default("platform")
+    def _platform_default(self):
+        """
+        Default platform
+        """
+        p = get_platform()
+        if p == "linux/arm64":
+            warnings.warn(
+                "Building for linux/arm64 is experimental. "
+                "To use the recommended platform set --Repo2Docker.platform=linux/amd64. "
+                "To silence this warning set --Repo2Docker.platform=linux/arm64."
+            )
+        return p
+
     extra_build_args = Dict(
         {},
         help="""
@@ -795,6 +817,7 @@ def build(self):
                         base_image=self.base_image
                     )
 
+                picked_buildpack.platform = self.platform
                 picked_buildpack.appendix = self.appendix
                 # Add metadata labels
                 picked_buildpack.labels["repo2docker.version"] = self.version
@@ -836,6 +859,7 @@ def build(self):
                         build_args,
                         self.cache_from,
                         self.extra_build_kwargs,
+                        platform=self.platform,
                     ):
                         if docker_client.string_output:
                             self.log.info(l, extra=dict(phase=R2dState.BUILDING))

repo2docker/buildpacks/base.py

@@ -232,6 +232,7 @@ def __init__(self, base_image):
                 "Windows environment detected. Note that Windows "
                 "support is experimental in repo2docker."
             )
+        self.platform = ""
 
     def get_packages(self):
         """
@@ -565,6 +566,7 @@ def build(
         build_args,
         cache_from,
         extra_build_kwargs,
+        platform=None,
     ):
         tarf = io.BytesIO()
         tar = tarfile.open(fileobj=tarf, mode="w")
@@ -619,6 +621,7 @@ def _filter_tar(tar):
             buildargs=build_args,
             container_limits=limits,
             cache_from=cache_from,
+            platform=platform,
         )
 
         build_kwargs.update(extra_build_kwargs)

repo2docker/buildpacks/conda/__init__.py

@@ -35,6 +35,14 @@ class CondaBuildPack(BaseImage):
     # extra pip requirements.txt for the notebook env
     _nb_requirements_file = ""
 
+    def _conda_platform(self):
+        """Return the conda platform name for the current platform"""
+        if self.platform == "linux/amd64":
+            return "linux-64"
+        if self.platform == "linux/arm64":
+            return "linux-aarch64"
+        raise ValueError(f"Unknown platform {self.platform}")
+
     def get_build_env(self):
         """Return environment variables to be set.
 
@@ -59,6 +67,7 @@ def get_build_env(self):
             # this exe should be used for installs after bootstrap with micromamba
             # switch this to /usr/local/bin/micromamba to use it for all installs
             ("MAMBA_EXE", "${CONDA_DIR}/bin/mamba"),
+            ("CONDA_PLATFORM", self._conda_platform()),
         ]
         if self._nb_requirements_file:
             env.append(("NB_REQUIREMENTS_FILE", self._nb_requirements_file))
@@ -160,13 +169,18 @@ def get_build_script_files(self):
         # major Python versions during upgrade.
         # If no version is specified or no matching X.Y version is found,
         # the default base environment is used.
-        frozen_name = "environment.lock"
+        frozen_name = f"environment-{self._conda_platform()}.lock"
         pip_frozen_name = "requirements.txt"
         if py_version:
             if self.python_version == "2.7":
+                if "linux-64" != self._conda_platform():
+                    raise ValueError(
+                        f"Python version 2.7 {self._conda_platform()} is not supported!"
+                    )
+
                 # python 2 goes in a different env
                 files[
-                    "conda/environment.py-2.7.lock"
+                    "conda/environment.py-2.7-linux-64.lock"
                 ] = self._kernel_environment_file = "/tmp/env/kernel-environment.lock"
                 # additional pip requirements for kernel env
                 if os.path.exists(os.path.join(HERE, "requirements.py-2.7.txt")):
@@ -176,12 +190,16 @@ def get_build_script_files(self):
                         self._kernel_requirements_file
                     ) = "/tmp/env/kernel-requirements.txt"
             else:
-                py_frozen_name = f"environment.py-{py_version}.lock"
+                py_frozen_name = (
+                    f"environment.py-{py_version}-{self._conda_platform()}.lock"
+                )
                 if os.path.exists(os.path.join(HERE, py_frozen_name)):
                     frozen_name = py_frozen_name
                     pip_frozen_name = f"requirements.py-{py_version}.pip"
                 else:
-                    raise ValueError(f"Python version {py_version} is not supported!")
+                    raise ValueError(
+                        f"Python version {py_version} {self._conda_platform()} is not supported!"
+                    )
         files[
             "conda/" + frozen_name
         ] = self._nb_environment_file = "/tmp/env/environment.lock"
@@ -366,6 +384,10 @@ def get_env_scripts(self):
                 """,
                 )
             )
+            if self.platform != "linux/amd64":
+                raise RuntimeError(
+                    f"RStudio is only available for linux/amd64 ({self.platform})"
+                )
             scripts += rstudio_base_scripts(self.r_version)
             scripts += [
                 (