better stack for mod-auth-openidc and mariadb

docker · May 2, 2017 · 7b321cb · 7b321cb
1 parent a30c78f
commit 7b321cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/comanage-registry-stack/README.md b/comanage-registry-stack/README.md
@@ -19,29 +19,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-# Docker Compose Example for COmanage Registry 
+# Docker Stack Deploy for COmanage Registry 
 
-This is an example Docker Compose file to deploy COmanage
-Registry with the Shibboleth Native SP for Apache HTTP Server
-and a PostgreSQL database.
+This is an example Docker compose file to deploy COmanage
+Registry with mod_auth_openidc for Apache HTTP Server
+for authentication and a MariaDB database using Docker stack deploy.
 
 See the individual image Dockerfile templates and README
 files for details on how to prepare the volumes and the
 necessary contents including the COmanage Registry 
-configuration and the Shibboleth SP configuration.
-
-Change the tag from `COMANAGE_REGISTRY_VERSION-shibboleth-sp`
-to `COMANAGE_REGISTRY_VERSION-basic-auth` to quickly deploy
-without the need for federation.
+configuration.
 
 ## Deploy
 
 ```
-docker-compose up
+docker stack deploy --compose-file comanage-registry-mod-auth-openidc-mariadb-stack.yml comanage-registry
 ```
 
 ## Tear Down
 
 ```
-docker-compose down
+docker stack rm comanage-registry
 ```
diff --git a/...egistry-mod-auth-openidc-maridb-stack.yml → ...gistry-mod-auth-openidc-mariadb-stack.yml b/...egistry-mod-auth-openidc-maridb-stack.yml → ...gistry-mod-auth-openidc-mariadb-stack.yml
@@ -20,7 +20,7 @@ services:
             replicas: 1
 
     comanage-registry-ldap:
-        image: cilogon/comanage-registry-slapd-cilogon
+        image: sphericalcowgroup/comanage-registry-slapd
         volumes:
             - /opt/slapd-data:/var/lib/ldap
             - /opt/slapd-config:/etc/ldap/slapd.d
@@ -29,8 +29,8 @@ services:
             - SLAPD_PRIVKEY_FILE=/run/secrets/slapd_privkey_file
             - SLAPD_CHAIN_FILE=/run/secrets/slapd_chain_file
             - OLC_ROOT_PW_FILE=/run/secrets/olc_root_pw
-            - OLC_SUFFIX=dc=cilogon,dc=org
-            - OLC_ROOT_DN=cn=admin,dc=cilogon,dc=org
+            - OLC_SUFFIX=dc=my,dc=org
+            - OLC_ROOT_DN=cn=admin,dc=my,dc=org
         secrets:
             - slapd_cert_file
             - slapd_privkey_file
@@ -45,7 +45,7 @@ services:
             replicas: 1
 
     comanage-registry:
-        image: cilogon/comanage-registry:2.0.0-rc3
+        image: sphericalcowgroup/comanage-registry:hotfix-2.0.x-mod-auth-openidc
         volumes:
             - /opt/comanage-registry-local:/local
         environment: