diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 82ea0e0..0f79a17 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -11,7 +11,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: templateflow/datalad + IMAGE_NAME: courtois-neuromod/datalad jobs: build-and-push-image: @@ -29,7 +29,7 @@ jobs: with: registry: ${{ env.REGISTRY }} username: cneuromod-bot - password: ${{ secrets.NIPREPS_BOT_PACKAGES }} + password: ${{ secrets.CNEUROMOD_BOT_REGISTRY_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta diff --git a/Dockerfile b/Dockerfile index 9e75d19..8795281 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,10 @@ -FROM python:3.8-slim +FROM python:3.8-alpine as builder -# Prepare environment -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - curl bzip2 git && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN apk update && apk add --no-cache curl bzip2 gcc libffi-dev musl-dev -ENV GIT_ANNEX_PACKAGE=git-annex-10.20220505-nodep_h1234567_0.tar.bz2 +RUN pip install datalad pytest ssh_agent_setup -RUN cd /usr/ && \ - curl -sSL https://anaconda.org/conda-forge/git-annex/10.20220505/download/linux-64/$GIT_ANNEX_PACKAGE | \ - tar -xj +FROM python:3.8-alpine +COPY --from=builder /usr/local /usr/local -RUN pip install datalad pytest ssh_agent_setup +RUN apk update && apk add --no-cache git openssh-client git-annex