.github/workflows/build.yml

@@ -6,13 +6,13 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY: ni-dataops.unf-montreal.ca
+  REGISTRY: ghcr.io
 
 jobs:
   build-and-push-image:
     strategy:
         matrix:
-          image: [datalad, datalad-apptainer, deface, dicom_indexer, heudiconv]
+          image: [datalad-apptainer, deface, dicom_indexer, heudiconv]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -26,14 +26,14 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ vars.NIDATAOPS_BOT_NAME }}
+          username: ${{ env.NIDATAOPS_BOT_NAME }}
           password: ${{ secrets.NIDATAOPS_BOT_REGISTRY_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.GITHUB_REPOSITORY_OWNER }}/${{ matrix.image }}
+          images: ${{ env.REGISTRY }}/${{ env.GITHUB_REPOSITORY_OWNER }}.${{ matrix.image }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5

.gitlab-ci.yml

@@ -54,7 +54,6 @@ build_all_dockers:
   parallel:
     matrix:
       - IMAGE_NAME:
-          - datalad
           - datalad-docker
           - datalad-apptainer
           - heudiconv

docker/datalad-apptainer/Dockerfile

@@ -15,7 +15,7 @@ RUN apk add --no-cache \
         make \
         util-linux-dev
 
-ARG APPTAINER_COMMITISH="v1.3.0"
+ARG APPTAINER_COMMITISH="main"
 ARG MCONFIG_OPTIONS="--with-suid"
 WORKDIR $GOPATH/src/github.com/apptainer
 RUN git clone https://github.com/apptainer/apptainer.git \

docker/datalad/Dockerfile

@@ -1,10 +0,0 @@
-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