Skip to content

Commit

Permalink
fix: Fix multi-arch by setting up QEMU (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
lsetiawan authored May 15, 2024
1 parent 4c796df commit 4032ce3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ jobs:
registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v5

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -128,6 +131,9 @@ jobs:
registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v5

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
6 changes: 0 additions & 6 deletions base-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,13 @@ ENTRYPOINT ["/usr/local/bin/_entrypoint.sh", "/srv/start"]
# ----------------------
ONBUILD USER root

# Set default shell for system setup
ONBUILD SHELL ["/bin/sh", "-c"]

# FIXME (?): user and home folder is hardcoded for now
# FIXME (?): this line breaks the cache of all steps below
ONBUILD COPY --chown=${NB_USER}:${NB_USER} . ${HOME}

# Make sure that /opt/conda is owned by non-root user, so we can install additional packages
ONBUILD RUN chown -R ${NB_USER}:${NB_USER} ${CONDA_DIR}

# Put the shell back to the micromamba shell
ONBUILD SHELL ["/usr/local/bin/_dockerfile_shell.sh"]

# repo2docker will load files from a .binder or binder directory if
# present. We check if those directories exist, and print a diagnostic
# message here.
Expand Down

0 comments on commit 4032ce3

Please sign in to comment.