*: rework scripts to reuse code and easily add new versions

Uses bash functions to a VERSIONS file to make it easier to just add new Ceph versions instead of having to duplicate the same script over and over again. Signed-off-by: Alexander Trost <galexrt@googlemail.com>
koor-tech · Dec 12, 2022 · 2cec24c · 2cec24c
1 parent cac2d10
commit 2cec24c
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 58 deletions.
diff --git a/.github/workflows/docker-image-rebuild.yml b/.github/workflows/docker-image-rebuild.yml
@@ -25,6 +25,4 @@ jobs:
 
     - name: Build and Push the Docker image to DockerHub
       run: |
-        src/build-push-container-imgs-quincy.sh
-        src/build-push-container-imgs-pacific.sh
-
+        src/build-push-container-imgs.sh
diff --git a/VERSIONS b/VERSIONS
@@ -0,0 +1,7 @@
+# Ceph versions to build images for
+# See https://docs.ceph.com/en/latest/releases/index.html
+
+# Ceph Pacific
+v16
+# Ceph Quincy
+v17
diff --git a/src/Dockerfile b/src/Dockerfile
@@ -31,5 +31,3 @@ RUN dnf install -y python3-pip xmlsec1 xmlsec1-nss xmlsec1-openssl && \
     REMOVED_SIZE=$((INITIAL_SIZE - FINAL_SIZE)) && \
     echo "Cleaning process removed ${REMOVED_SIZE}MB" && \
     echo "Dropped container size from ${INITIAL_SIZE}MB to ${FINAL_SIZE}MB";
-
-
diff --git a/src/_common.sh b/src/_common.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(dirname "${0}")"
+
+REPO_QUAY_TAGS_PAGE_SIZE="${REPO_QUAY_TAGS_PAGE_SIZE:-50}"
+
+# Usage: [VERSION_REGEX]
+getCephPointRelease() {
+    VERSION_REGEX="${1}"
+    if [ -z "${VERSION_REGEX}" ]; then
+        echo "No argument given to getCephPointRelease (needed: version regex) ..."
+        return 1
+    fi
+    CEPH_POINT_RELEASE=$(curl -s -L \
+        "https://quay.io/api/v1/repository/ceph/ceph/tag?page_size=${REPO_QUAY_TAGS_PAGE_SIZE}" | \
+        jq -r '."tags"[].name' | \
+        sort -r --version-sort | \
+		grep "${VERSION_REGEX}" | \
+		head -n 1)
+    retVal=$?
+    if [ $retVal -ne 0 ]; then
+        echo "Failed to get the Ceph Point Release from quay.io API."
+        return 1
+    fi
+
+    if [ -z "${CEPH_POINT_RELEASE}" ]; then
+        echo "Empty Ceph point release found. quay.io/ceph/ceph repo doesn't seem to have a tag for version regex '${VERSION_REGEX}'"
+        exit 2
+    fi
+
+    echo "${CEPH_POINT_RELEASE}"
+}
+
+# Usage: [CEPH_POINT_RELEASE]
+checkIfAlreadyExists() {
+    CEPH_POINT_RELEASE="${1}"
+    if [ -z "${CEPH_POINT_RELEASE}" ]; then
+        echo "No argument given to checkIfAlreadyExists (needed: ceph point release) ..."
+        return 2
+    fi
+
+    if curl -s "https://registry.hub.docker.com/v2/repositories/koorinc/koor-ceph-container/tags/?page_size=${REPO_QUAY_TAGS_PAGE_SIZE}" | jq -r '.results[].name' | grep -q "$CEPH_POINT_RELEASE"; then
+        return 0
+    fi
+
+    return 1
+}
+
+# Usage: [CEPH_POINT_RELEASE]
+buildAndPushCephPointRelease() {
+    CEPH_POINT_RELEASE="${1}"
+    if [ -z "${CEPH_POINT_RELEASE}" ]; then
+        echo "No argument given to buildAndPushCephPointRelease (needed: ceph point release) ..."
+        return 1
+    fi
+
+    if checkIfAlreadyExists "${CEPH_POINT_RELEASE}"; then
+        echo "Container for ${CEPH_POINT_RELEASE} already available at koorinc's Docker Hub, skipping build."
+        return 0
+    fi
+
+    docker build \
+        --build-arg CEPH_POINT_RELEASE="${CEPH_POINT_RELEASE}" \
+        --file "${SCRIPT_DIR}/Dockerfile" \
+        --tag "${CONTAINER_REGISTRY}/${CONTAINER_REPO}:${CEPH_POINT_RELEASE}" \
+        .
+
+    docker push "${CONTAINER_REGISTRY}/${CONTAINER_REPO}:${CEPH_POINT_RELEASE}"
+}
+
+# Usage: [VERSION_REGEX]
+buildAndPushCephWrapper() {
+    VERSION_REGEX="${1}"
+    if [ -z "${VERSION_REGEX}" ]; then
+        echo "No argument given to buildAndPushCephWrapper (needed: version regex) ..."
+        return 1
+    fi
+
+    CEPH_POINT_RELEASE=$(getCephPointRelease "$VERSION_REGEX")
+    retVal=$?
+    if [ $retVal -ne 0 ]; then
+        echo "Failed to get the Ceph Point Release"
+        return 1
+    fi
+
+    buildAndPushCephPointRelease "${CEPH_POINT_RELEASE}"
+}
diff --git a/src/build-push-container-imgs-base.sh b/src/build-push-container-imgs-base.sh
diff --git a/src/build-push-container-imgs-pacific.sh b/src/build-push-container-imgs-pacific.sh
diff --git a/src/build-push-container-imgs-quincy.sh b/src/build-push-container-imgs-quincy.sh
diff --git a/src/build-push-container-imgs.sh b/src/build-push-container-imgs.sh
@@ -0,0 +1,11 @@
+#!/bin/bash -ex
+
+# shellcheck disable=SC1091
+source "$(dirname "${0}")/_common.sh"
+
+while IFS= read -r VERSION; do
+    if ! buildAndPushCephWrapper "${VERSION}"; then
+        echo "Error during buildAndPushCephWrapper, exiting 1"
+        exit 1
+    fi
+done < <(grep -Po '^[^\W]+' "${SCRIPT_DIR}/../VERSIONS")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,5 +31,3 @@ RUN dnf install -y python3-pip xmlsec1 xmlsec1-nss xmlsec1-openssl && \
		REMOVED_SIZE=$((INITIAL_SIZE - FINAL_SIZE)) && \
		echo "Cleaning process removed ${REMOVED_SIZE}MB" && \
		echo "Dropped container size from ${INITIAL_SIZE}MB to ${FINAL_SIZE}MB";