From a8014c737308730188afab82f969c5f1aff5ba43 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 8 Jul 2025 11:31:17 +0300 Subject: [PATCH 1/2] Bump OS version to rocky linux 10.0 --- Dockerfile | 10 +++++++--- common.bash | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23649a7..61e28b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,9 @@ LABEL comanage_registry_src_url=${COMANAGE_REGISTRY_SRC_URL} ARG COMANAGE_REGISTRY_DIR ENV COMANAGE_REGISTRY_DIR=${COMANAGE_REGISTRY_DIR:-/srv/comanage-registry} +ARG CACHEDIR +ENV CACHEDIR=${CACHEDIR:-${COMANAGE_REGISTRY_DIR}/app/tmp/cache} + RUN yum -y update && yum -y install \ busybox \ && yum clean -y all @@ -23,12 +26,13 @@ RUN mkdir -p "${COMANAGE_REGISTRY_DIR}" \ && wget -O comanage.tar.gz ${COMANAGE_REGISTRY_SRC_URL} \ && tar -zxf comanage.tar.gz -C ${COMANAGE_REGISTRY_DIR} --strip-components=1 \ && rm -f comanage.tar.gz \ + # Setup the tmp directory && rm -rf ${COMANAGE_REGISTRY_DIR}/app/tmp \ && cp -r ${COMANAGE_REGISTRY_DIR}/app/tmp.dist ${COMANAGE_REGISTRY_DIR}/app/tmp \ && chown -R apache:apache ${COMANAGE_REGISTRY_DIR}/app/tmp \ - && cd ${COMANAGE_REGISTRY_DIR}/local \ - && ln -s ${COMANAGE_REGISTRY_DIR}/app/tmp tmp \ - && chown -h apache:apache ${COMANAGE_REGISTRY_DIR}/local/tmp \ + # Setup the webroot directory. The permissions and the symbolic link under the appache root directory + && chown -h apache:apache ${COMANAGE_REGISTRY_DIR}/app/webroot \ + && chown -h apache:apache ${COMANAGE_REGISTRY_DIR}/local/webroot \ && cd /var/www/html \ && ln -s ${COMANAGE_REGISTRY_DIR}/app/webroot registry diff --git a/common.bash b/common.bash index 482e52a..3fff39a 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="i2incommon" -imagename="comanage-registry-cron" +imagename="comanage-registry-cron-dev" comanage_version="4.5.0" From 92c4d52a0f119409ee728e9fea82b539650fad75 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 8 Jul 2025 11:46:58 +0300 Subject: [PATCH 2/2] Move to production dockerhub folder --- common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.bash b/common.bash index 3fff39a..482e52a 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="i2incommon" -imagename="comanage-registry-cron-dev" +imagename="comanage-registry-cron" comanage_version="4.5.0"