Fix CI

medicalinformatics · Sep 6, 2024 · 9c687da · 9c687da
1 parent 57c20a8
commit 9c687da
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 34 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -9,6 +9,4 @@ README.md
 CONTRIBUTING.md
 compiler_commands.json
 tags
-.git
-.gitmodules
 .gitignore
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
@@ -28,38 +28,38 @@ jobs:
       -
         name: init git submodules
         run: scripts/init_submodules.sh
-      -
-        name: set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: log in to github container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: define docker tags
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/medicalinformatics/secureepilinker
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-          flavor: |
-            latest=auto
-            prefix=${{ matrix.distribution }}-
+#      -
+#        name: set up QEMU
+#        uses: docker/setup-qemu-action@v1
+#      -
+#        name: set up Docker Buildx
+#        uses: docker/setup-buildx-action@v1
+#      -
+#        name: log in to github container registry
+#        uses: docker/login-action@v1
+#        with:
+#          registry: ghcr.io
+#          username: ${{ github.actor }}
+#          password: ${{ secrets.GITHUB_TOKEN }}
+#      -
+#        name: define docker tags
+#        id: meta
+#        uses: docker/metadata-action@v3
+#        with:
+#          images: |
+#            ghcr.io/medicalinformatics/secureepilinker
+#          tags: |
+#            type=schedule
+#            type=ref,event=branch
+#            type=ref,event=pr
+#          flavor: |
+#            latest=auto
+#            prefix=${{ matrix.distribution }}-
       -
         name: build docker image
         uses: docker/build-push-action@v2
         with:
-          push: true
+#          push: true
           file: Dockerfile.${{ matrix.distribution }}
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: ${{ steps.meta.outputs.tags }}
+#          labels: ${{ steps.meta.outputs.labels }}
+#          tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -19,6 +19,7 @@ RUN apt-get update && \
   libpython3-dev \
   python3-distutils-extra \
   libcurl4-openssl-dev \
+  git \
   && rm -rf /var/lib/apt/lists/*
 
 # We only installed gcc-10 -> make default
@@ -27,11 +28,14 @@ RUN ln -s /usr/bin/gcc-10 /usr/bin/gcc \
   && ln -s /usr/bin/gcov-10 /usr/bin/gcov
 
 WORKDIR /app
+COPY scripts scripts
+COPY .git .git
+COPY .gitmodules .gitmodules
+RUN ./scripts/init_submodules.sh
 COPY extern extern
 COPY cmake cmake
 COPY include include
 COPY test test
-COPY scripts scripts
 COPY pysel pysel
 COPY CMakeLists.txt sepilinker.cpp ./