From 0ab71bdc4946ad59194cc10eb4244b5c0a65be41 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Fri, 14 Jul 2017 09:35:22 -0500 Subject: [PATCH] Changed layout of COmanage Registry local directory Changed layout so that /local is a symlink to /srv/comanage-registry/local instead of the other way around so that plugins can easily reference files under /srv/comanage-registry/app such as the StandardController view files add.ctp and edit.ctp. --- comanage-registry-basic-auth/Dockerfile.template | 6 ++---- comanage-registry-mod-auth-openidc/Dockerfile.template | 6 ++---- comanage-registry-mod-auth-openidc/README.md | 2 +- comanage-registry-shibboleth-sp/Dockerfile.template | 6 ++---- comanage-registry-shibboleth-sp/README.md | 2 +- comanage-registry/Dockerfile.template | 6 ++---- comanage-registry/README.md | 2 +- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/comanage-registry-basic-auth/Dockerfile.template b/comanage-registry-basic-auth/Dockerfile.template index 90f9af5..e0ae717 100644 --- a/comanage-registry-basic-auth/Dockerfile.template +++ b/comanage-registry-basic-auth/Dockerfile.template @@ -63,10 +63,8 @@ RUN mkdir -p "$COMANAGE_REGISTRY_DIR" \ && chown -R www-data:www-data "$COMANAGE_REGISTRY_DIR/app/tmp" \ && cd /var/www/html \ && ln -s "$COMANAGE_REGISTRY_DIR/app/webroot" registry \ - && cd "$COMANAGE_REGISTRY_DIR" \ - && rm -rf local \ - && mkdir -p /local \ - && ln -s /local local \ + && rm -rf "$COMANAGE_REGISTRY_DIR/local/*" \ + && ln -s "$COMANAGE_REGISTRY_DIR/local" /local \ && a2enmod headers \ && a2enmod ssl \ && a2enmod rewrite \ diff --git a/comanage-registry-mod-auth-openidc/Dockerfile.template b/comanage-registry-mod-auth-openidc/Dockerfile.template index 3714d6c..41f9737 100644 --- a/comanage-registry-mod-auth-openidc/Dockerfile.template +++ b/comanage-registry-mod-auth-openidc/Dockerfile.template @@ -102,10 +102,8 @@ RUN mkdir -p "$COMANAGE_REGISTRY_DIR" \ && chown -R www-data:www-data "$COMANAGE_REGISTRY_DIR/app/tmp" \ && cd /var/www/html \ && ln -s "$COMANAGE_REGISTRY_DIR/app/webroot" registry \ - && cd "$COMANAGE_REGISTRY_DIR" \ - && rm -rf local \ - && mkdir -p /local \ - && ln -s /local local \ + && rm -rf "$COMANAGE_REGISTRY_DIR/local/*" \ + && ln -s "$COMANAGE_REGISTRY_DIR/local" /local \ && a2enmod headers \ && a2enmod ssl \ && a2enmod rewrite \ diff --git a/comanage-registry-mod-auth-openidc/README.md b/comanage-registry-mod-auth-openidc/README.md index 3f90e83..f071674 100644 --- a/comanage-registry-mod-auth-openidc/README.md +++ b/comanage-registry-mod-auth-openidc/README.md @@ -152,7 +152,7 @@ Redirect /registry/users/logout https:///secure/redirect?logout=https% ``` docker run -d --name comanage-registry \ - -v /opt/comanage-registry:/local \ + -v /opt/comanage-registry:/srv/comanage-registry/local \ --network comanage-registry-internal-network \ -p 80:80 -p 443:443 \ comanage-registry:${COMANAGE_REGISTRY_VERSION}-mod-auth-openidc diff --git a/comanage-registry-shibboleth-sp/Dockerfile.template b/comanage-registry-shibboleth-sp/Dockerfile.template index 07ff404..744bfb5 100644 --- a/comanage-registry-shibboleth-sp/Dockerfile.template +++ b/comanage-registry-shibboleth-sp/Dockerfile.template @@ -206,10 +206,8 @@ RUN mkdir -p "$COMANAGE_REGISTRY_DIR" \ && chown -R www-data:www-data "$COMANAGE_REGISTRY_DIR/app/tmp" \ && cd /var/www/html \ && ln -s "$COMANAGE_REGISTRY_DIR/app/webroot" registry \ - && cd "$COMANAGE_REGISTRY_DIR" \ - && rm -rf local \ - && mkdir -p /local \ - && ln -s /local local \ + && rm -rf "$COMANAGE_REGISTRY_DIR/local/*" \ + && ln -s "$COMANAGE_REGISTRY_DIR/local" /local \ && a2enmod headers \ && a2enmod ssl \ && a2enmod rewrite \ diff --git a/comanage-registry-shibboleth-sp/README.md b/comanage-registry-shibboleth-sp/README.md index 1a11042..c419285 100644 --- a/comanage-registry-shibboleth-sp/README.md +++ b/comanage-registry-shibboleth-sp/README.md @@ -132,7 +132,7 @@ COPY sp-key.pem /etc/shibboleth/sp-key.pem ``` docker run -d --name comanage-registry \ - -v /opt/comanage-registry:/local \ + -v /opt/comanage-registry:/srv/comanage-registry/local \ --network comanage-registry-internal-network \ -p 80:80 -p 443:443 \ comanage-registry:${COMANAGE_REGISTRY_VERSION}-shibboleth-sp diff --git a/comanage-registry/Dockerfile.template b/comanage-registry/Dockerfile.template index 90f9af5..e0ae717 100644 --- a/comanage-registry/Dockerfile.template +++ b/comanage-registry/Dockerfile.template @@ -63,10 +63,8 @@ RUN mkdir -p "$COMANAGE_REGISTRY_DIR" \ && chown -R www-data:www-data "$COMANAGE_REGISTRY_DIR/app/tmp" \ && cd /var/www/html \ && ln -s "$COMANAGE_REGISTRY_DIR/app/webroot" registry \ - && cd "$COMANAGE_REGISTRY_DIR" \ - && rm -rf local \ - && mkdir -p /local \ - && ln -s /local local \ + && rm -rf "$COMANAGE_REGISTRY_DIR/local/*" \ + && ln -s "$COMANAGE_REGISTRY_DIR/local" /local \ && a2enmod headers \ && a2enmod ssl \ && a2enmod rewrite \ diff --git a/comanage-registry/README.md b/comanage-registry/README.md index 45d1b1a..b0c5348 100644 --- a/comanage-registry/README.md +++ b/comanage-registry/README.md @@ -109,7 +109,7 @@ When creating the container mount the directory you created, eg. ``` docker run -d --name comanage-registry \ - -v /docker/srv/comanage-registry/local:/local + -v /docker/srv/comanage-registry/local:/srv/comanage-registry/local -p 80:80 -p 443:443 \ comanage-registry:${COMANAGE_REGISTRY_VERSION} ```