fix clearcache

docker · May 14, 2024 · 0502174 · 0502174
1 parent 792794a
commit 0502174
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/comanage-registry-base/Dockerfile b/comanage-registry-base/Dockerfile
@@ -69,11 +69,12 @@ RUN mkdir -p ${COMANAGE_REGISTRY_DIR} \
       && curl -L -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 \
-      && rm -f ${COMANAGE_REGISTRY_DIR}/app/tmp \
+      && rm -rf ${COMANAGE_REGISTRY_DIR}/app/tmp \
       && cp -r ${COMANAGE_REGISTRY_DIR}/app/tmp.dist ${COMANAGE_REGISTRY_DIR}/app/tmp \
       && chown -R www-data:www-data ${COMANAGE_REGISTRY_DIR}/app/tmp \
       && cd /var/www/html \
       && ln -s ${COMANAGE_REGISTRY_DIR}/app/webroot registry \
+      && chown -h www-data:www-data registry \
       && rm -rf ${COMANAGE_REGISTRY_DIR}/local/*
 
 RUN rm -rf /tmp/build

diff --git a/comanage-registry-internet2-tier-base/Dockerfile b/comanage-registry-internet2-tier-base/Dockerfile
@@ -88,7 +88,7 @@ RUN cd php-src \
             --with-sodium \
             --with-xsl \
             --with-zlib \
-	    --with-pic \
+            --with-pic \
         && export CFLAGS="$PHP_CFLAGS" \
         && export CPPFLAGS="$PHP_CPPFLAGS" \
         && export LDFLAGS="$PHP_LDFLAGS" \

diff --git a/comanage-registry-internet2-tier/Dockerfile b/comanage-registry-internet2-tier/Dockerfile
@@ -108,13 +108,20 @@ RUN cd /etc/httpd/conf.d \
     && ln -s /etc/pki/tls/private/localhost.key privkey.pem \
     && chmod 755 /usr/local/bin/sendtierbeacon.sh \
     && chmod 755 /usr/local/bin/setupcron.sh \
+    && rm -f /etc/shibboleth/shibboleth2.xml \
+    && rm -f /etc/httpd/conf.modules.d/mod_lua.so \
     && /usr/local/bin/setupcron.sh \
+    && 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 \
+    && rm -rf ${COMANAGE_REGISTRY_DIR}/local/* \
+    && ln -s ${COMANAGE_REGISTRY_DIR}/local /local \
+    && ln -s ${COMANAGE_REGISTRY_DIR}/app/tmp ${COMANAGE_REGISTRY_DIR}/local/tmp \
+    && chown -h apache:apache ${COMANAGE_REGISTRY_DIR}/local/tmp \
     && cd /var/www/html \
     && ln -s ${COMANAGE_REGISTRY_DIR}/app/webroot registry \
-    && rm -rf ${COMANAGE_REGISTRY_DIR}/local/* \
-    && chown -R apache:apache ${COMANAGE_REGISTRY_DIR}/app/tmp \
-    && rm -f /etc/shibboleth/shibboleth2.xml \
-    && rm -f /etc/httpd/conf.modules.d/mod_lua.so
+    && chown -h apache:apache registry
+
 
 # Allow values for first administrator bootstrapped into the
 # platform to be specified at image build time, in addition to