Add 3.8 images

.github/workflows/ci.yml

@@ -6,14 +6,19 @@ on:
   pull_request:
     branches: [main]
   schedule:
-    - cron: 0 0 * * 0
+    - cron: "0 0 * * 0"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   build:
     strategy:
       matrix:
-        version: [3.8, 3.7, 3.6]
+        version: ["3.8", "3.7", "3.6"]
         image: [glacier2, icegridregistry, icegridnode, icestorm]
+      fail-fast: false
 
     runs-on: ubuntu-latest
 
@@ -23,4 +28,47 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            zeroc/${{ matrix.image }}
+            ghcr.io/zeroc-ice/${{ matrix.image }}
+          tags: |
+            type=raw,value=${{ matrix.version }}
+            type=raw,value=latest,enable=${{ matrix.version == '3.8' }}
+
+      - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GHCR
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ${{ matrix.version }}/${{ matrix.image }}
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: ${{ matrix.version == '3.6' && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.markdownlint.json

@@ -0,0 +1,7 @@
+{
+  "no-duplicate-heading": {
+    "siblings_only": true
+  },
+  "line-length": false,
+  "single-h1": false
+}

3.6/glacier2/Dockerfile

@@ -2,15 +2,13 @@ FROM ubuntu:16.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG GLACIER2_VERSION=3.6.5
-
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 5E6DA83306132997 \
-    && echo "deb http://download.zeroc.com/Ice/3.6/ubuntu16.04 stable main" >> /etc/apt/sources.list.d/ice.list \
+    && echo "deb http://download.zeroc.com/ice/3.6/ubuntu16.04 stable main" >> /etc/apt/sources.list.d/ice.list \
     && apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-        zeroc-glacier2=${GLACIER2_VERSION}-* \
+    zeroc-glacier2 \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 EXPOSE 4063 4064

3.6/icegridnode/Dockerfile

@@ -2,18 +2,16 @@ FROM ubuntu:16.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG ICEGRID_VERSION=3.6.5
-
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 5E6DA83306132997 \
-    && echo "deb http://download.zeroc.com/Ice/3.6/ubuntu16.04 stable main" >> /etc/apt/sources.list.d/ice.list \
+    && echo "deb http://download.zeroc.com/ice/3.6/ubuntu16.04 stable main" >> /etc/apt/sources.list.d/ice.list \
     && apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-        zeroc-icegrid=${ICEGRID_VERSION}-* \
+    zeroc-icegrid \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-EXPOSE 4061 4062
+EXPOSE 4061
 
 VOLUME ["/var/lib/ice/icegrid"]
 

3.6/icegridregistry/Dockerfile

@@ -2,18 +2,16 @@ FROM ubuntu:16.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG ICEGRID_VERSION=3.6.5
-
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 5E6DA83306132997 \
     && echo "deb http://download.zeroc.com/Ice/3.6/ubuntu16.04 stable main" >> /etc/apt/sources.list.d/ice.list \
     && apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-        zeroc-icegrid=${ICEGRID_VERSION}-* \
+    zeroc-icegrid \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-EXPOSE 4061 4062
+EXPOSE 4061
 
 VOLUME ["/var/lib/ice/icegrid"]
 

3.6/icestorm/Dockerfile

@@ -2,20 +2,18 @@ FROM ubuntu:16.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG ICEBOX_VERSION=3.6.5
-
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 5E6DA83306132997 \
     && echo "deb http://download.zeroc.com/Ice/3.6/ubuntu16.04 stable main" >> /etc/apt/sources.list.d/ice.list \
     && apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-        zeroc-icebox=${ICEBOX_VERSION}-* \
-        libzeroc-icestorm3.6=${ICEBOX_VERSION}-* \
+    zeroc-icebox \
+    libzeroc-icestorm3.6 \
     && rm -rf /var/lib/apt/lists/*
 
 VOLUME ["/data"]
 
 ENTRYPOINT ["/usr/bin/icebox", "--IceBox.Service.IceStorm=IceStormService,36:createIceStorm \
-                                                          --Ice.Config=/etc/icestorm.conf \
-                                                          --Freeze.DbEnv.IceStorm.DbHome=/data"]
+    --Ice.Config=/etc/icestorm.conf \
+    --Freeze.DbEnv.IceStorm.DbHome=/data"]

3.7/glacier2/Dockerfile

@@ -2,7 +2,6 @@ FROM ubuntu:22.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG GLACIER2_VERSION=3.7.10
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN groupadd -r ice && useradd -r -g ice ice
@@ -21,12 +20,12 @@ RUN mkdir -p /etc/apt/keyrings \
 
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-    zeroc-glacier2=${GLACIER2_VERSION}-* \
+    zeroc-glacier2 \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN sed -i '/^Ice\.UseSystemdJournal=1/d' /etc/glacier2router.conf \
     && sed -i 's/^Glacier2\.Client.Endpoints=.*/Glacier2\.Client\.Endpoints=tcp -h 0\.0\.0\.0 -p 4063/' /etc/glacier2router.conf \
-    && sed -i 's/^Glacier2\.Server\.Endpoints=*/#Glacier2\.Server\.Endpoints=/' /etc/glacier2router.conf
+    && sed -i 's/^Glacier2\.Server\.Endpoints=.*/#Glacier2\.Server\.Endpoints=/' /etc/glacier2router.conf
 
 EXPOSE 4063 4064
 

3.7/icegridnode/Dockerfile

@@ -2,7 +2,6 @@ FROM ubuntu:22.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG ICEGRID_VERSION=3.7.10
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN groupadd -r ice && useradd -r -m -d /var/lib/ice -g ice ice
@@ -21,7 +20,7 @@ RUN mkdir -p /etc/apt/keyrings \
 
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-    zeroc-icegrid=${ICEGRID_VERSION}-* \
+    zeroc-icegrid \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN sed -i '/^Ice.UseSystemdJournal=1/d' /etc/icegridnode.conf \
@@ -30,7 +29,7 @@ RUN sed -i '/^Ice.UseSystemdJournal=1/d' /etc/icegridnode.conf \
     && sed -i 's/^Ice.Default.Locator=.*/#Ice.Default.Locator=/' /etc/icegridnode.conf \
     && sed -i 's/IceGrid.Node.Endpoints=.*/IceGrid.Node.Endpoints=tcp -h 0\.0\.0\.0/' /etc/icegridnode.conf
 
-EXPOSE 4061 4062
+EXPOSE 4061
 
 VOLUME ["/var/lib/ice/icegrid"]
 

3.7/icegridregistry/Dockerfile

@@ -2,7 +2,6 @@ FROM ubuntu:22.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG ICEGRID_VERSION=3.7.10
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN groupadd -r ice && useradd -r -m -d /var/lib/ice -g ice ice
@@ -21,17 +20,17 @@ RUN mkdir -p /etc/apt/keyrings \
 
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-    zeroc-icegrid=${ICEGRID_VERSION}-* \
+    zeroc-icegrid \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN sed -i '/^Ice.UseSystemdJournal=1/d' /etc/icegridregistry.conf \
     && sed -i 's/^IceGrid\.Registry\.Client\.Endpoints=.*/IceGrid\.Registry\.Client\.Endpoints=tcp -h 0\.0\.0\.0 -p 4061/' /etc/icegridregistry.conf \
     && sed -i 's/^IceGrid\.Registry\.Server\.Endpoints=.*/IceGrid\.Registry\.Server\.Endpoints=tcp -h 0\.0\.0\.0/' /etc/icegridregistry.conf \
     && sed -i 's/^IceGrid\.Registry\.Internal\.Endpoints=.*/IceGrid\.Registry\.Internal\.Endpoints=tcp -h 0\.0\.0\.0/' /etc/icegridregistry.conf
 
-EXPOSE 4061 4062
+EXPOSE 4061
 
-VOLUME ["/var/lib/ice/icegrid/"]
+VOLUME ["/var/lib/ice/icegrid"]
 
 COPY ./docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]

3.7/icestorm/Dockerfile

@@ -2,7 +2,6 @@ FROM ubuntu:22.04
 
 LABEL maintainer="docker-maintainers@zeroc.com"
 
-ARG ICEBOX_VERSION=3.7.10
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN groupadd -r ice && useradd -r -m -d /var/lib/ice -g ice ice
@@ -21,8 +20,8 @@ RUN mkdir -p /etc/apt/keyrings \
 
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-    zeroc-icebox=${ICEBOX_VERSION}-* \
-    libzeroc-icestorm3.7=${ICEBOX_VERSION}-* \
+    zeroc-icebox \
+    libzeroc-icestorm3.7 \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 VOLUME ["/data"]