minor cleanup

.github/workflows/build.yml

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/docker-openldap
 #
-# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
 name: Build
 
 on:
@@ -22,14 +22,14 @@ on:
   workflow_dispatch:
     # https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/
 
-env:
-  DOCKER_IMAGE_REPO: vegardit/openldap
-  TRIVY_CACHE_DIR: ~/.trivy/cache
-
 defaults:
   run:
     shell: bash
 
+env:
+  DOCKER_IMAGE_REPO: vegardit/openldap
+  TRIVY_CACHE_DIR: ~/.trivy/cache
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -61,10 +61,6 @@ jobs:
     - name: Install dos2unix
       run: sudo apt-get install --no-install-recommends -y dos2unix
 
-    - name: Install regclient
-      if: ${{ github.ref_name == 'main' && github.event_name != 'pull_request' && !env.ACT }} # https://github.com/nektos/act#skipping-steps
-      uses: iarekylew00t/regctl-installer@v1
-
     - name: Login to docker.io
       if: ${{ github.ref_name == 'main' && github.event_name != 'pull_request' && !env.ACT }} # https://github.com/nektos/act#skipping-steps
       uses: docker/login-action@v2

build-image.sh

@@ -19,7 +19,6 @@ source "$shared_lib/lib/build-image-init.sh"
 #################################################
 image_repo=${DOCKER_IMAGE_REPO:-vegardit/openldap}
 base_image_name=${DOCKER_BASE_IMAGE:-debian:bookworm-slim}
-base_image_tag=${base_image_name#*:}
 image_name=$image_repo:latest
 
 

image/Dockerfile

@@ -8,7 +8,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/docker-openldap
 
-# https://hub.docker.com/_/debian?tab=tags&name=bookworm-slim
+# https://hub.docker.com/_/debian/tags?name=bookworm-slim
 ARG BASE_IMAGE=debian:bookworm-slim
 
 # see https://github.com/hadolint/hadolint/wiki/DL3006
@@ -26,9 +26,10 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LC_ALL=C
 
-ARG BASE_LAYER_CACHE_KEY
 ARG INSTALL_SUPPORT_TOOLS=0
 
+ARG BASE_LAYER_CACHE_KEY
+
 #ARG PQCHECKER_URL=https://meddeb.net/pub/pqchecker/deb/8/pqchecker_2.0.0_amd64.deb
 ARG PQCHECKER_URL=https://github.com/pqchecker/pqchecker-binaries/raw/main/deb/8/pqchecker_2.0.0_amd64.deb
 ARG PQCHECKER_MD5=c005ce596e97d13e39485e711dcbc7e1