Merge pull request #30 from gerlero/dockerfile

Update Dockerfile

Dockerfile

@@ -4,8 +4,6 @@ FROM ubuntu:${UBUNTU_VERSION} AS base
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
-    wget \
-    ca-certificates \
     libnss-wrapper \
  && rm -rf /var/lib/apt/lists/*
 
@@ -18,11 +16,9 @@ ENTRYPOINT ["/openfoam/run"]
 FROM base AS org
 ARG OPENFOAM_VERSION=12
 
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
-   software-properties-common \
- && wget -O /etc/apt/trusted.gpg.d/openfoam.asc https://dl.openfoam.org/gpg.key  \
- && add-apt-repository -y http://dl.openfoam.org/ubuntu \
+COPY gpg.key /etc/apt/keyrings/openfoam-org.asc
+
+RUN echo "deb [signed-by=/etc/apt/keyrings/openfoam-org.asc] http://dl.openfoam.org/ubuntu $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main" >> /etc/apt/sources.list.d/openfoam.list \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
     openfoam${OPENFOAM_VERSION} \
@@ -44,8 +40,13 @@ CMD ["bash"]
 FROM base AS slim-base
 ARG OPENFOAM_VERSION=2406
 
+COPY pubkey.gpg /etc/apt/keyrings/openfoam-com.asc
+
 RUN apt-get update \
- && wget -O - https://dl.openfoam.com/add-debian-repo.sh | bash \
+ && apt-get install -y --no-install-recommends \
+    ca-certificates \
+ && echo "deb [signed-by=/etc/apt/keyrings/openfoam-com.asc] https://dl.openfoam.com/repos/deb $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main" >> /etc/apt/sources.list.d/openfoam.list \
+ && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
    openfoam${OPENFOAM_VERSION} \
  && rm -rf /var/lib/apt/lists/* \

gpg.key

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFeGXxcBCACpBHAlBk67MVnHtLux0eI/gJuo5eTSLzQd4TYXgLbOXs8aCEH1
+7JKAS24m2KwtcqBwTfW+wb54b0HHzJn81Zpmd7JXt/6oX4wZHTXMED9/P893UHOI
+sC5e1O9BzDQ4J1Ot4SMMRElNZyxdcbqGTvp+t67xrBqG1ZoXO4WYfUemNT+I4xrs
+xzguKVvL+yWB8hHZ6JpzScC3xQM9JSL7Gzmv6NvXkr+fDw6Ct/aUdB3PjbSlINKC
+4sTfQRvokE6nf7SVMqiPTDup+E1DLLfzvUJSxoCGc34wbiuA5ThqE11Y4DiLZaLe
+r3V03nbEJY2T1cGExS7njMs3uFiICovfWdmXABEBAAG0KE9wZW5GT0FNIEZvdW5k
+YXRpb24gPGFkbWluQG9wZW5mb2FtLm9yZz6JATcEEwEKACEFAleGXxcCGwMFCwkI
+BwMFFQoJCAsFFgMCAQACHgECF4AACgkQbA2scosp2BdYdAf+K1+RfWZZSZBwqpPR
+MNvV8RkpQ5k7m68NdFRha6cmxCnFJwyw7EJrI0ZXrnz+VstmTvTt05a2ml3MvMdK
+WBZs0/dA3LuqYLjGCPCDB5iu5w/sVCXyawZejoe/X3/ODRDgUiJ1LCKQbhwHqNda
+yIH7gBYdmy3bzjncm5lYn/Jxw42qAOog/Lnwrru5EIeTyNWrk495KEjTasb9L31I
+61G5oEkZsoDk6kPIf93lHBzey60wyc3dU6jQAbnjCB1PvcQP12uv8MK0bO6E5TKS
+BYj/W3wayzaU/FD7NIbCbsHqc1rDNDutp3Y6B5z3tP3bSJ70FfoWfGWuuPG6uEJy
+W5EHUbkBDQRXhl8XAQgAxQnYD9yvl19ULD3el+vhwUb+xIj2gkpyCfP3g6as68OR
+6QsHfYyFrLxBCroGb/fx4AT240ikErplgYThr+fwVl8CXyWtdrgrUwU8DopTTiTN
+xYxbxklljp8ZO8rJNPpIWJBTIUSZv+2sd+LrkcEocZ0tWsUoshlc3iBYtmiO+HbW
+9yAxKHOkA3eooSZHERs8BIQ+ZLhv3x5FB73jbMYOIB0dqU2GrbDvFBnKx9AWheCd
+JsOAlAlGnNcyI4ZDdJ33DozCUgalxmTMGrfPyCvz9zqKm1gQsscmrNFij/F9TeNY
++oEjRoXwwnyM5YiexMcxhLp2NPjagFU0lNS8gCFy2QARAQABiQEfBBgBCgAJBQJX
+hl8XAhsMAAoJEGwNrHKLKdgXShUH/1rUNk9MvoZ9HBdvm7/z70J64cnNPjIwPuhO
+5FMihCMmnsESjCgzrP6rVDOma4psf7fwEe8m1cltl8gVQ1cZIo2LO/0XnbBeo9b9
+hA+RqtKz9IZYqNzbvGxEbkhMf6O/TDSFmJpAueh8D3/Dgcrvya0bflkwoGl7RDKu
+Iq68v4Ri1s4LAq8RCIsB85NKds2vLIAuMrhbhtwYEVgalPotMMHX/MMrKL5T95Ac
+/GuySu+Yk7kmfrFq0SIzP1BFGv+l84ke18zMu0ssGHVGY0eaEEpO2aude+HhMJqD
++PmSM0ZDHsJu4It2PIIGtgGWfai9ddXOI2+z8W6ugsKr/tq7Sik=
+=DlyX
+-----END PGP PUBLIC KEY BLOCK-----

pubkey.gpg

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: signing for openfoam.com packages
+
+mQINBF6fBMQBEACqRTvEOYTj/c9VdywKrT8k59YWzMokpS78HsItpzPClH+inVSI
+mXlW9vu8AFr+pBMNBVxIIgVJtc44cPsIR5O1rLoDqrjGO0PmTv9ayQZyVttav8u1
+8CM/NB8oNFpxzyQpx0nKByJmQSwd5W+aDQc5rf7EW43FGIiNS19xVhqizYbfurMt
+0hFZ9LSTEBkjElIu91nxIxBNPq7xjzFbCFx2qKvQU9asbzP1SMF7k8l/e3WLQnWl
+SkDnO0ElPYPhuRXNY1y74/c0eGrsyOfKmBtA/7NjJP9MlB1OXqYMuxLnOPi0EsXz
+sw9XtAV36cBc0OMrqfkiodmlR9Bqy+wQSCigvFRdidVjDMO5PBq4pcVjcqBXhCGU
+6EQ5mB5L9LI7qYUiZclkPSEgXcz02tTxC1SsjqVIScF/v1GPhuGupwj2RKpF+XXR
+bebMSdYqiqs8oBkQdGYEPujt/CTBxjxRrDJYxqyhEZ5D8j3u66K0EJ/isGTJadzg
+RbV67qWidjsh5Gs2rhzoyRXCAY04YXBNES7tTNw0gY1GvkqdH86jkk6y7gHzWOoe
+R6KK2gNM0SccTUgMqgKg51KI2clXdjOCSR9lFCOsQ8CjXgizi/I8u2vU7s/lEe/D
+casS9DRXPhvvReZq0vfMxsoMTiyZRnSuTRKMJH1pjcIwi8oCO1NWWjrcawARAQAB
+tCJvcGVuZm9hbS1jb20gPGFkbWluQG9wZW5jZmQuY28udWs+iQJOBBMBCAA4FiEE
+3JPAlhdBIuJW2iQGM4bddJSNII8FAl6fMBcCGwMFCwkIBwIGFQoJCAsCBBYCAwEC
+HgECF4AACgkQM4bddJSNII8xmg/9FlJi4lXNzPj1jtNqHuKdDjvWfc19SdupoPJh
+ox+BDokXaf252tDIvy7VljtoCdFsnKm/dVnrM39PrhBmX0cxaM6GoyvWlO3NyWtY
+FaWgudNkLrU+wykYqv8YdYhtFA08rUPCuhqsi6YVRv3jFLGlygfIZwdSY3tnbOr9
+k/4bUP9kXcEJLVMErt7O3pFJ010p7IAYzYMk79W0q9wqpzmxmR5TiERfKMT1NEH0
+hTdgAWk3Y62PVNHs05cYQNt3m7s/6lho4Sk1+bzDzDiuYUAE4US61z+FXwoF0+MW
+GFtVF90p8mAVR+jPA8jqBnuk2Q7ghiGBgFYFn7XBAJkclGwIMOEuv4I+YvINJ2EB
+e/whJBukv6BN36BGbsJNEdwGLS2Oqpb4WCAhlrDrF3J5lPwrYvRItY+87Q+KAlZc
+AcQnv2vplK8RWBauHC3K7+rgtJ1KwBhGa06zYUalufe8N6NEpwQuAh9QuIQfOhHd
+nWe7yvv1aY22Ldj0ZUxTrmG0BZObLHcO8wdoY95uMxtCZZ6DR8rzpUDxUQoIjP3y
+FbA5BjS2RLCXU1n927RlJ5Exu1g261Yduaf0qgMOlfaQYo8wj/MDlM+Vfz2yNpD/
+fqESgTpLDpl1Zu95BU649DV7M/x0ZwzyRhM1UsO3v2MXKWKgDz0drglCK3351XP/
+PfOLQKE=
+=Slzt
+-----END PGP PUBLIC KEY BLOCK-----