Switch to building Ubuntu-based images

Author: gerlero

.github/workflows/build-push.yml

@@ -42,7 +42,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          build-args: FOAM_VERSION=${{ env.FOAM_VERSION }}
+          build-args: |
+            OS_VER=${{ env.FOAM_VERSION <= 2012 && '20.04' || '22.04'}}
+            FOAM_VERSION=${{ env.FOAM_VERSION }}
           target: run
           platforms: linux/arm64
           load: true
@@ -56,7 +58,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          build-args: FOAM_VERSION=${{ env.FOAM_VERSION }}
+          build-args: |
+            OS_VER=${{ env.FOAM_VERSION <= 2012 && '20.04' || '22.04'}}
+            FOAM_VERSION=${{ env.FOAM_VERSION }}
           target: dev
           platforms: linux/arm64
           load: true
@@ -70,7 +74,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          build-args: FOAM_VERSION=${{ env.FOAM_VERSION }}
+          build-args: |
+            OS_VER=${{ env.FOAM_VERSION <= 2012 && '20.04' || '22.04'}}
+            FOAM_VERSION=${{ env.FOAM_VERSION }}
           target: default
           platforms: linux/arm64
           load: true

Dockerfile

@@ -1,18 +1,80 @@
-# syntax = edrevo/dockerfile-plus
+# ---------------------------------*-sh-*------------------------------------
+# Copyright (C) 2021-2022 OpenCFD Ltd.
+# Copyright (C) 2023 Gabriel Gerlero
+# SPDX-License-Identifier: (GPL-3.0+)
+#
+# Create openfoam '-run' image using Ubuntu.
+#
+# Example
+#     docker build -f openfoam-run.Dockerfile .
+#     docker build --build-arg OS_VER=impish --build-arg FOAM_VERSION=2212
+#         -t opencfd/openfoam-run:2212 ...
+#
+# Note
+#     Uses wget for fewer dependencies than curl
+#
+# ---------------------------------------------------------------------------
+ARG OS_VER=latest
 
-INCLUDE+ openfoam-run_leap.Dockerfile
+FROM ubuntu:${OS_VER} AS distro
+
+# Version-independent base layer
+FROM distro AS base0
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get -y install --no-install-recommends \
+    apt-utils vim-tiny nano-tiny wget ca-certificates rsync \
+    sudo passwd libnss-wrapper \
+ && rm -rf /var/lib/apt/lists/*
+
+# Version-specific runtime layer
+FROM base0 AS runtime
+ARG FOAM_VERSION=2212
+ARG PACKAGE=openfoam${FOAM_VERSION}
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | bash \
+ && apt-get update \
+ && apt-get -y install --no-install-recommends ${PACKAGE} \
+ && rm -rf /var/lib/apt/lists/*
+
+# ---------------
+# User management
+# - nss-wrapper
+# - openfoam sandbox directory
+
+FROM runtime AS user
+COPY openfoam-files.rc/ /openfoam/
+RUN  /bin/sh /openfoam/assets/post-install.sh -fix-perms
+
+ENTRYPOINT [ "/openfoam/run" ]
+
+# ---------------------------------------------------------------------------
 
-# run target: builds an 'openfoam-run' image
 FROM user AS run
 
-# dev target: builds an 'openfoam-dev' image
+# ---------------------------------------------------------------------------
+
 FROM run AS dev
+ARG FOAM_VERSION
+ARG PACKAGE=openfoam${FOAM_VERSION}-dev
+ARG DEBIAN_FRONTEND=noninteractive
 
-RUN zypper -n install -y ${PACKAGE}-devel \
- && zypper -n clean
+RUN apt-get update \
+ && apt-get -y install --no-install-recommends ${PACKAGE} \
+ && rm -rf /var/lib/apt/lists/*
+
+# ---------------------------------------------------------------------------
 
-# default target: builds an 'openfoam-default' image
 FROM dev AS default
+ARG FOAM_VERSION
+ARG PACKAGE=openfoam${FOAM_VERSION}-default
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get -y install --no-install-recommends ${PACKAGE} \
+ && rm -rf /var/lib/apt/lists/*
 
-RUN zypper -n install -y ${PACKAGE}-default \
- && zypper -n clean
+# ---------------------------------------------------------------------------

README.md

@@ -2,6 +2,7 @@
 
 | ✨ OpenFOAM v2306 is now available (and will be used by default) |
 | ---- |
+| **NOTE:** Docker images are now based on Ubuntu, to match the official (x86) images |
 
 | 🖥  Using a Mac? If so, you may also want to check out my [native OpenFOAM builds for macOS.](https://github.com/gerlero/openfoam-app) |
 | ---- |
@@ -55,7 +56,7 @@ The `-default` option requests a full environment (including the tutorial suite
 
 ## Details
 
-ARM-based OpenFOAM environments are packaged in Docker images based on OpenSUSE Leap, using the official ARM binaries as recommended in the [OpenFOAM Docker FAQ](https://develop.openfoam.com/Development/openfoam/-/wikis/precompiled/docker#frequently-asked-questions). Note that this means that the base Linux distribution differs from the [official Docker images](https://hub.docker.com/u/opencfd), which use Ubuntu. The ARM-based Docker images are built here using GitHub Actions and uploaded to [Docker Hub](https://hub.docker.com/u/gerlero/). Dockerfiles and supporting files are based on those in the [official _packaging/containers_ repository](https://develop.openfoam.com/packaging/containers).
+Dockerfiles and supporting files are based on those in the [official _packaging/containers_ repository](https://develop.openfoam.com/packaging/containers). Images from this repo used to be based on OpenSUSE Leap, but have since switched to Ubuntu to match the [official x86 Docker images](https://hub.docker.com/u/opencfd), as official binaries are now available for Ubuntu on ARM.
 
 ## Legal notices