From 3bb48fb9f5e171bc7b97c37745718f4302c26df3 Mon Sep 17 00:00:00 2001
From: Tobias Kussel <tobias.kussel@dkfz-heidelberg.de>
Date: Wed, 4 Sep 2024 09:05:22 +0000
Subject: [PATCH] fix develop ci

---
 .github/workflows/docker.yml |  4 ++--
 Dockerfile.ubuntu            | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c73de60..2d60686 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches:
       - 'master'
-      - 'develop'
+      - 'dev'
       - 'feature/beamsel'
     tags:
       - 'v*.*.*'
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index b3a79c3..fd8e422 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM ubuntu:rolling as build
+FROM ubuntu:rolling AS build
 
 # Backup libs so we know what to copy later to runtime image
 RUN find /lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ -name '*.so*' > /shared-libs.list
@@ -6,10 +6,8 @@ RUN find /lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ -name '*.so*' > /shar
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
   dpkg-dev \
-  g++-12 \
+  g++-10 \
   libc6-dev \
-  python3-dev \
-  python3-distutils-extra \
   libssl-dev \
   openssl \
   cmake \
@@ -17,13 +15,16 @@ RUN apt-get update && \
   libboost-system-dev \
   libboost-thread-dev \
   libgmp-dev \
+  python3 \
+  libpython3-dev \
+  python3-distutils-extra \
   libcurl4-openssl-dev \
   && rm -rf /var/lib/apt/lists/*
 
-# We only installed gcc-12 -> make default
-RUN ln -s /usr/bin/gcc-12 /usr/bin/gcc \
-  && ln -s /usr/bin/g++-12 /usr/bin/g++ \
-  && ln -s /usr/bin/gcov-12 /usr/bin/gcov
+# We only installed gcc-10 -> make default
+RUN ln -s /usr/bin/gcc-10 /usr/bin/gcc \
+  && ln -s /usr/bin/g++-10 /usr/bin/g++ \
+  && ln -s /usr/bin/gcov-10 /usr/bin/gcov
 
 WORKDIR /app
 COPY extern extern
@@ -31,6 +32,7 @@ COPY cmake cmake
 COPY include include
 COPY test test
 COPY scripts scripts
+COPY pysel pysel
 COPY CMakeLists.txt sepilinker.cpp ./
 
 # build!
@@ -80,3 +82,4 @@ EXPOSE 1337-1344
 
 USER sel:sel
 ENTRYPOINT ["/app/sel"]
+