From fe7a254f25debc16fbf362dacb18fc98af324c76 Mon Sep 17 00:00:00 2001 From: bpinsard Date: Tue, 23 Apr 2024 12:55:07 -0400 Subject: [PATCH] add pure datalad container, freeze apptainer version --- .gitea/workflows/build.yml | 2 +- .gitlab-ci.yml | 1 + docker/datalad-apptainer/Dockerfile | 2 +- docker/datalad/Dockerfile | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 docker/datalad/Dockerfile diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 6ea0574..c38a6cc 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -12,7 +12,7 @@ jobs: build-and-push-image: strategy: matrix: - image: [datalad-apptainer, deface, dicom_indexer, heudiconv] + image: [datalad, datalad-apptainer, deface, dicom_indexer, heudiconv] runs-on: ubuntu-latest permissions: contents: read diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de079ad..8b12103 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,6 +54,7 @@ build_all_dockers: parallel: matrix: - IMAGE_NAME: + - datalad - datalad-docker - datalad-apptainer - heudiconv diff --git a/docker/datalad-apptainer/Dockerfile b/docker/datalad-apptainer/Dockerfile index 5dcf681..0e6003a 100644 --- a/docker/datalad-apptainer/Dockerfile +++ b/docker/datalad-apptainer/Dockerfile @@ -15,7 +15,7 @@ RUN apk add --no-cache \ make \ util-linux-dev -ARG APPTAINER_COMMITISH="main" +ARG APPTAINER_COMMITISH="v1.3.0" ARG MCONFIG_OPTIONS="--with-suid" WORKDIR $GOPATH/src/github.com/apptainer RUN git clone https://github.com/apptainer/apptainer.git \ diff --git a/docker/datalad/Dockerfile b/docker/datalad/Dockerfile new file mode 100644 index 0000000..dae3f5c --- /dev/null +++ b/docker/datalad/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3.11-alpine as builder + +RUN apk update && apk add --no-cache curl bzip2 gcc libffi-dev musl-dev + +RUN python -m pip install datalad pytest ssh_agent_setup + +FROM python:3.11-alpine +COPY --from=builder /usr/local /usr/local + +RUN apk update && apk add --no-cache git openssh-client git-annex