Skip to content

Commit

Permalink
Changed layout of COmanage Registry local directory
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
skoranda committed Jul 14, 2017
1 parent fb37d22 commit 0ab71bd
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 19 deletions.
6 changes: 2 additions & 4 deletions comanage-registry-basic-auth/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 2 additions & 4 deletions comanage-registry-mod-auth-openidc/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry-mod-auth-openidc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Redirect /registry/users/logout https://<myserver>/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
Expand Down
6 changes: 2 additions & 4 deletions comanage-registry-shibboleth-sp/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry-shibboleth-sp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions comanage-registry/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}
```
Expand Down

0 comments on commit 0ab71bd

Please sign in to comment.