Split dockerfiles (#386)

* split up dockerfiles

* push base image once

* push once

* only build base-image if file has changed

* reduce number of build-threads

* do not upload as asset anymore

* remove base build from extpar build

* build base image too

* drop arm64 for regular pipelines

* same for base image

* remove wrong comment

Author: jonasjucker

.github/workflows/build-base-container.yml

@@ -0,0 +1,35 @@
+name: Build Base image
+
+on:
+  push:
+    paths:
+      - '.github/workflows/build-base-container.yml'
+      - 'Dockerfile.base'
+
+jobs:
+  build-base:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: c2sm
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build base image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile.base
+          push: false
+          tags: c2sm/extpar-base:latest
+          platforms: linux/amd64

.github/workflows/build-container.yml

@@ -21,18 +21,11 @@ jobs:
           username: c2sm
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build Docker image
+      - name: Build extpar image
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile.extpar
           push: false
           tags: c2sm/extpar:latest
-          outputs: type=oci,dest=extpar_image.tar
-          platforms: linux/amd64,linux/arm64
-
-      - name: Upload Docker image as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: extpar_image.tar
-          path: extpar_image.tar
+          platforms: linux/amd64

…ws/deploy-container-as-release-asset.yml .github/workflows/upload_to_dockerhub.yml.github/workflows/deploy-container-as-release-asset.yml renamed to .github/workflows/upload_to_dockerhub.yml .github/workflows/deploy-container-as-release-asset.yml renamed to .github/workflows/upload_to_dockerhub.yml

@@ -1,12 +1,12 @@
-name: Build Docker Image and Upload as Release Asset
+name: Build Base and Extpar images and upload to Docker Hub
 
 on:
   push:
     tags:
       - '*'
 
 jobs:
-  build_and_release:
+  build_and_upload:
     runs-on: ubuntu-latest
 
     steps:
@@ -24,14 +24,20 @@ jobs:
           username: c2sm
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and Save Docker image
-        id: build_docker_image
+      - name: Build base image
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile.base
+          push: true
+          tags: c2sm/extpar-base:latest
+          platforms: linux/amd64,linux/arm64
+
+      - name: Build extpar image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile.extpar
           push: true
           tags: c2sm/extpar:${{ github.ref_name }}
           platforms: linux/amd64,linux/arm64
-          asset_name: extpar_image.tar
-          asset_content_type: application/x-tar

Dockerfile

@@ -0,0 +1,37 @@
+# Use the latest Debian image
+FROM debian:bookworm-slim
+
+# Set environment variables to avoid interactive prompts during package installation
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Needed for testsuite to pick correct path to input-data
+ENV HOSTNAME=docker
+
+# Update the package list and install required packages
+RUN apt-get update && \
+    apt-get install -y \
+    git \
+    vim \
+    gcc \
+    gfortran \
+    libnetcdf-dev \
+    libnetcdff-dev \
+    libsz2 \
+    libomp-dev \
+    python3 \
+    python3-pip \
+    python3-venv  \
+    bc \
+    cdo \
+    wget \
+    && apt-get clean
+
+# Verify installations
+RUN gcc --version && \
+    gfortran --version && \
+    git --version && \
+    vim --version && \
+    nc-config --version && \
+    nf-config --version
+
+CMD ["/bin/bash"]

Dockerfile.base

@@ -0,0 +1,34 @@
+FROM c2sm/extpar-base:latest
+
+# set pipefail for make command
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# Set the working directory
+WORKDIR /workspace
+
+# Copy the configuration script into the container
+COPY . /workspace/
+
+# Run the configuration script
+RUN /workspace/configure.docker.gcc
+
+# Build extpar
+RUN cd /workspace && make -j 2  2>&1 | tee -a compile.log
+
+# Create a virtual environment and install the package
+RUN python3 -m venv /workspace/venv && \
+    . /workspace/venv/bin/activate && \
+    cd /workspace && \
+    pip install -r requirements.txt && \
+    pip install setuptools && \
+    python3 setup.py sdist && \
+    pip install dist/extpar-*.tar.gz
+
+# Add the virtual environment to the PATH
+ENV PATH="/workspace/venv/bin:$PATH"
+
+# Set the working directory
+WORKDIR /workspace/python
+
+# Default command
+CMD ["/bin/bash"]

Dockerfile.extpar

@@ -33,6 +33,7 @@ case "$(hostname)" in
 
     # container build run at CO2
     *co2*)
-        run_command podman build -t extpar:$ghprbPullId -f Dockerfile .
+        run_command podman build -t extpar-base:latest -f Dockerfile.base .
+        run_command podman build -t extpar:$ghprbPullId -f Dockerfile.extpar .
         ;;
 esac