Merge pull request #1 from gerlero/com

Add extra openfoam.com versions
gerlero · Aug 7, 2024 · a84ba61 · a84ba61
2 parents 3d35dd4 + 5269d7c
commit a84ba61
Show file tree

Hide file tree

Showing 3 changed files with 325 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
           push: ${{ github.event_name == 'push' }}
           target: slim
           build-args: |
-            OPENFOAM_VERSION=2312
+            OPENFOAM_VERSION=2406
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
@@ -88,6 +88,310 @@ jobs:
           push: ${{ github.event_name == 'push' }}
           build-args: |
             OPENFOAM_VERSION=2312
+  com-2306:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2306-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=2306
+            UBUNTU_VERSION=22.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2306
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=2306
+            UBUNTU_VERSION=22.04
+  com-2212:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2212-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=2212
+            UBUNTU_VERSION=22.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2212
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=2212
+            UBUNTU_VERSION=22.04
+  com-2206:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2206-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=2206
+            UBUNTU_VERSION=22.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2206
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=2206
+            UBUNTU_VERSION=22.04
+  com-2112:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2112-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=2112
+            UBUNTU_VERSION=22.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2112
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=2112
+            UBUNTU_VERSION=22.04
+  com-2106:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2106-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=2106
+            UBUNTU_VERSION=22.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2106
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=2106
+            UBUNTU_VERSION=22.04
+  com-2012:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2012-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=2012
+            UBUNTU_VERSION=22.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2012
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=2012
+            UBUNTU_VERSION=22.04
+  com-2006:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2006-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=2006
+            UBUNTU_VERSION=22.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: 'linux/amd64,linux/arm64'
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:2006
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=2006
+            UBUNTU_VERSION=22.04
+  com-1912:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: vars.DOCKERHUB_REPOSITORY
+        continue-on-error: ${{ github.event_name == 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push (slim)
+        uses: docker/build-push-action@v6
+        with:
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:1912-slim
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          target: slim
+          build-args: |
+            OPENFOAM_VERSION=1912
+            UBUNTU_VERSION=18.04
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          tags: |
+            ${{ vars.DOCKERHUB_REPOSITORY }}:1912
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          build-args: |
+            OPENFOAM_VERSION=1912
+            UBUNTU_VERSION=18.04
   org-12:
     runs-on: ubuntu-latest
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ubuntu:24.04 AS org
+ARG UBUNTU_VERSION=24.04
+
+FROM ubuntu:${UBUNTU_VERSION} AS org
 ARG OPENFOAM_VERSION=12
 
 RUN apt-get update \
@@ -25,7 +27,7 @@ ENTRYPOINT ["/openfoam/run"]
 CMD ["bash"]
 
 
-FROM ubuntu:24.04 AS slim
+FROM ubuntu:${UBUNTU_VERSION} AS slim
 ARG OPENFOAM_VERSION=2406
 
 RUN apt-get update \

diff --git a/README.md b/README.md
@@ -12,6 +12,22 @@
 - `slim`, `com-slim`, `2406-slim`
 - `2312`
 - `2312-slim`
+- `2306`
+- `2306-slim`
+- `2212`
+- `2212-slim`
+- `2206`
+- `2206-slim`
+- `2112`
+- `2112-slim`
+- `2106`
+- `2106-slim`
+- `2012` (amd64 only)
+- `2012-slim` (amd64 only)
+- `2006`
+- `2006-slim`
+- `1912` (amd64 only)
+- `1912-slim` (amd64 only)
 
 ### openfoam.org