From 46a74b747575d15112a410df8edc7335c4f10ce7 Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Fri, 15 Jun 2018 08:28:45 -0500
Subject: [PATCH] Refactor slapd-base and slapd

As part of refactor of slapd moved the entrypoint script from
slapd-base to slapd and created Dockerfile for slapd to put it
into plase.
---
 comanage-registry-slapd-base/Dockerfile       |  5 +---
 comanage-registry-slapd/Dockerfile            | 23 +++++++++++++++++++
 .../README.md                                 |  0
 .../docker-slapd-entrypoint                   |  0
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 comanage-registry-slapd/Dockerfile
 rename {comanage-registry-slapd-base => comanage-registry-slapd}/README.md (100%)
 rename {comanage-registry-slapd-base => comanage-registry-slapd}/docker-slapd-entrypoint (100%)

diff --git a/comanage-registry-slapd-base/Dockerfile b/comanage-registry-slapd-base/Dockerfile
index badf898..6e73870 100644
--- a/comanage-registry-slapd-base/Dockerfile
+++ b/comanage-registry-slapd-base/Dockerfile
@@ -1,4 +1,4 @@
-# slapd Dockerfile template for use with COmanage Registry
+# slapd base Dockerfile for use with COmanage Registry
 #
 # Portions licensed to the University Corporation for Advanced Internet
 # Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -41,9 +41,6 @@ COPY voperson.ldif /etc/ldap/schema/
 VOLUME [ "/var/lib/ldap", "/etc/ldap/slapd.d" ]
 
 COPY comanage_ldap_utils.sh /usr/local/lib/
-COPY docker-slapd-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-slapd-entrypoint"]
 
 EXPOSE 389
 
diff --git a/comanage-registry-slapd/Dockerfile b/comanage-registry-slapd/Dockerfile
new file mode 100644
index 0000000..dcc408d
--- /dev/null
+++ b/comanage-registry-slapd/Dockerfile
@@ -0,0 +1,23 @@
+# slapd Dockerfile template for use with COmanage Registry
+#
+# Portions licensed to the University Corporation for Advanced Internet
+# Development, Inc. ("UCAID") under one or more contributor license agreements.
+# See the NOTICE file distributed with this work for additional information
+# regarding copyright ownership.
+#
+# UCAID licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+FROM sphericalcowgroup/comanage-registry-slapd-base
+
+COPY docker-slapd-entrypoint /usr/local/bin/
+
+ENTRYPOINT ["docker-slapd-entrypoint"]
diff --git a/comanage-registry-slapd-base/README.md b/comanage-registry-slapd/README.md
similarity index 100%
rename from comanage-registry-slapd-base/README.md
rename to comanage-registry-slapd/README.md
diff --git a/comanage-registry-slapd-base/docker-slapd-entrypoint b/comanage-registry-slapd/docker-slapd-entrypoint
similarity index 100%
rename from comanage-registry-slapd-base/docker-slapd-entrypoint
rename to comanage-registry-slapd/docker-slapd-entrypoint