postgresql: remove version strings

Trying to run creation in a single job exhausts disk space while
also being slower than running a matrix. As only two image are
required for the others to build, run those in serial then the rest in
a matrix.

.github/workflows/release.yaml

@@ -0,0 +1,45 @@
+name: Dockerfiles Release
+on: create
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: true
+env:
+  GITHUB_TOKEN: ${{ github.token }}
+
+jobs:
+  release-pre-reqs:
+    if: (github.event_name == 'create' && github.event.ref_type == 'tag')
+    name: Release image required by other images
+    runs-on: ubuntu-latest
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v4
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push os-core
+        run: ./build-and-push-images.sh os-core ${{ github.event.ref }}
+      - name: Build and Push httpd
+        run: ./build-and-push-images.sh httpd ${{ github.event.ref }}
+  release-matrix:
+    needs: release-pre-reqs
+    if: (github.event_name == 'create' && github.event.ref_type == 'tag')
+    name: Release Matrix
+    strategy:
+      matrix:
+        image: ['cgit', 'golang', 'haproxy', 'iperf', 'mariadb', 'memcached', 'nginx', 'node', 'numpy-mp', 'perl', 'php', 'php-fpm', 'postgres', 'python', 'rabbitmq', 'r-base', 'redis', 'ruby', 'tesseract-ocr']
+    runs-on: ubuntu-latest
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v4
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push
+        run: ./build-and-push-images.sh ${{ matrix.image }} ${{ github.event.ref }}

.github/workflows/test.yml

@@ -35,9 +35,8 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: install
-      run: | 
+      run: |
-        sudo apt-get purge moby-engine moby-cli 
+        sudo apt-get install bats -f
-        sudo apt-get install docker.io bats -f
         sudo modprobe -r overlay
         sudo modprobe overlay redirect_dir=off
         sudo systemctl restart docker

README.md

@@ -2,5 +2,6 @@ Clear Linux* based Docker Containers
 ====================================
 ![](https://github.com/clearlinux/dockerfiles/workflows/CI/badge.svg)
 
-This repository holds all the Dockerfiles for Clear Linux based containers that are hosted at:
+This repository holds all the Dockerfiles for Clear Linux based containers.
-https://hub.docker.com/u/clearlinux/
+
+The base image can be found in Docker's base repository or at https://github.com/clearlinux/docker-brew-clearlinux/ (which also has previous image releases under branches).

build-and-push-images.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+create_image() {
+    local name="$1"
+    local ver="$2"
+    pushd "${name}"
+	echo "Creating ${name} for version ${ver}"
+    docker build -t ghcr.io/clearlinux/"${name}":"${ver}" . --build-arg="clear_ver=${ver}"
+    popd
+}
+
+push_image() {
+    local name="$1"
+    local ver="$2"
+	echo "Pushing ${name} for version ${ver}"
+    docker push ghcr.io/clearlinux/"${name}":"${ver}"
+}
+
+build_and_push_image() {
+    local name="$1"
+    local ver="$2"
+    create_image "${name}" "${ver}"
+    push_image "${name}" "${ver}"
+}
+
+build_and_push_image $1 $2

cgit/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/httpd:$clear_ver AS httpd
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/httpd:latest /usr/lib/os-release /
+COPY --from=httpd /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/httpd:latest / /os_core_install/
+COPY --from=httpd / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/httpd:latest
+FROM httpd
 
 COPY --from=builder /install_root /
 COPY cgitrc /etc/cgitrc

clr-installer-ci/Dockerfile

@@ -1,10 +1,11 @@
 FROM clearlinux:latest
+ARG clear_ver
 
 # Configure Go
 ENV GOPATH="/go" PATH="/go/bin:${PATH}"
 
 # Update and add bundles
-RUN swupd update && \
+RUN swupd update -V $clear_ver && \
     swupd bundle-add sysadmin-basic storage-utils network-basic go-basic-dev devpkg-gtk3 clr-installer-gui && \
     swupd clean && \
     # Install the Go Linters

docker-hooks.sh

@@ -68,7 +68,7 @@ function do_tag {
     local image=$1
     local pkg=$2
     local base=$3
-    
+
     echo "=> Tagging the $image"
     local tag=$(get_tag $pkg)
 

golang/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

haproxy/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest  AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,12 +26,12 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

httpd/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

iperf/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest  AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,12 +26,12 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

mariadb/Dockerfile

@@ -1,15 +1,18 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest as builder
 
+ARG clear_ver
 ARG swupd_args
 
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -24,11 +27,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

memcached/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

mixer-ci/Dockerfile

@@ -1,16 +1,15 @@
 FROM clearlinux:latest
+ARG clear_ver
 
 # Configure Go
 ENV GOPATH /home/clr/go
 ENV PATH="/home/clr/go/bin:${PATH}"
 
 # Update and add bundles
-RUN swupd update && \
+RUN swupd update -V $clear_ver && \
     swupd bundle-add mixer go-basic c-basic os-core-update-dev sudo && \
     useradd -G wheelnopw clr && \
     mkdir -p /run/lock
 USER clr
 RUN git config --global user.email "travis@example.com" && \
-    git config --global user.name "Travis CI" && \
+    git config --global user.name "Travis CI"
-    curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.18.0
-

nginx/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 COPY default.conf /etc/nginx-mainline/conf.d/default.conf

node/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,12 +26,12 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

numpy-mp/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

os-core/Dockerfile

@@ -1,9 +1,10 @@
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 
 # Move to latest Clear Linux release
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Install clean os-core bundle in target directory
 # using the new os version

perl/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,14 +26,14 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 
 WORKDIR /root
 
-CMD ["perl5.28.2","-de0"]
+CMD ["perl","-de0"]

php-fpm/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,12 +26,12 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

php/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -32,11 +35,11 @@ opcache.revalidate_freq=${OPCACHE_REVALIDATE_FREQ}' >> /install_root/usr/share/d
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 ENV OPCACHE_REVALIDATE_FREQ=0 \
     OPCACHE_VALIDATE_TIMESTAMPS=0 \

postgres/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -16,25 +19,25 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=postgresql11,su-exec --no-boot-update
+    --bundles=postgresql,su-exec --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 
-ENV PATH $PATH:/usr/libexec/postgresql11
+ENV PATH $PATH:/usr/libexec/postgresql
 ENV PGDATA /var/lib/pgsql/data
-RUN sed -i "s|#listen_addresses.*|listen_addresses = '*'|" /usr/share/postgresql11/postgresql.conf.sample && \
+RUN sed -i "s|#listen_addresses.*|listen_addresses = '*'|" /usr/share/postgresql/postgresql.conf.sample && \
-    mkdir -p /run/postgresql11 && chown -R postgres:postgres /run/postgresql11 && \
+    mkdir -p /run/postgresql && chown -R postgres:postgres /run/postgresql && \
     mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && \
     mkdir /docker-entrypoint-initdb.d && \
     mkdir -p /usr/local/bin
@@ -42,8 +45,7 @@ RUN sed -i "s|#listen_addresses.*|listen_addresses = '*'|" /usr/share/postgresql
 VOLUME /var/lib/pgsql/data
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh && \
-    ln -s /usr/local/bin/docker-entrypoint.sh / && \
+    ln -s /usr/local/bin/docker-entrypoint.sh /
-    ln -s /usr/share/postgresql11 /usr/share/postgresql
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 

postgres/docker-entrypoint.sh

@@ -34,9 +34,9 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
 	chown -R postgres "$PGDATA"
 	chmod 700 "$PGDATA"
 
-	mkdir -p /var/run/postgresql11
+	mkdir -p /var/run/postgresql
-	chown -R postgres /var/run/postgresql11
+	chown -R postgres /var/run/postgresql
-	chmod 775 /var/run/postgresql11
+	chmod 775 /var/run/postgresql
 
 	# Create the transaction log directory before initdb is run (below) so the directory is owned by the correct user
 	if [ "$POSTGRES_INITDB_WALDIR" ]; then

python/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,12 +26,12 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
 
-FROM clearlinux/os-core:latest
+FROM core
 
 ENV NAME="clearlinux-python"
 COPY --from=builder /install_root /

r-base/Dockerfile

@@ -1,15 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
-
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -24,12 +26,12 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

rabbitmq/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

redis/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

ruby/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,11 +26,11 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /
 

tesseract-ocr/Dockerfile

@@ -1,14 +1,17 @@
+ARG clear_ver
+FROM ghcr.io/clearlinux/os-core:$clear_ver AS core
 FROM clearlinux:latest AS builder
 
+ARG clear_ver
 ARG swupd_args
 # Move to latest Clear Linux release to ensure
 # that the swupd command line arguments are
 # correct
-RUN swupd update --no-boot-update $swupd_args
+RUN swupd update --no-boot-update -V $clear_ver $swupd_args
 
 # Grab os-release info from the minimal base image so
 # that the new content matches the exact OS version
-COPY --from=clearlinux/os-core:latest /usr/lib/os-release /
+COPY --from=core /usr/lib/os-release /
 
 # Install additional content in a target directory
 # using the os version from the minimal base
@@ -23,12 +26,12 @@ RUN source /os-release && \
 # file exists on different layers. To minimize docker
 # image size, remove the overlapped files before copy.
 RUN mkdir /os_core_install
-COPY --from=clearlinux/os-core:latest / /os_core_install/
+COPY --from=core / /os_core_install/
 RUN cd / && \
     find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
 
 
-FROM clearlinux/os-core:latest
+FROM core
 
 COPY --from=builder /install_root /