-
Notifications
You must be signed in to change notification settings - Fork 976
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release-1.0.0' into stable
- Loading branch information
Showing
52 changed files
with
150 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,32 @@ | ||
FROM osixia/baseimage:0.10.5 | ||
FROM osixia/light-baseimage:0.1.0 | ||
MAINTAINER Bertrand Gouny <[email protected]> | ||
|
||
# Use baseimage-docker's init system. | ||
CMD ["/sbin/my_init"] | ||
# Use baseimage's init system. | ||
# https:/osixia/docker-light-baseimage/blob/stable/image/tool/run | ||
CMD ["/container/tool/run"] | ||
|
||
# Add openldap user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added | ||
RUN groupadd -r openldap && useradd -r -g openldap openldap | ||
|
||
# Install OpenLDAP, ldap-utils and ssl-kit from baseimage, remove default ldap db | ||
RUN apt-get -y update && /sbin/enable-service ssl-kit \ | ||
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes --no-install-recommends \ | ||
slapd ldap-utils ntp \ | ||
&& rm -rf /var/lib/ldap /etc/ldap/slapd.d | ||
# Install OpenLDAP, ldap-utils and ssl-helper from baseimage and remove default ldap db | ||
# https:/osixia/docker-light-baseimage/blob/stable/image/tool/install-service-available | ||
RUN apt-get -y update \ | ||
&& /container/tool/install-service-available ssl-helper-gnutls \ | ||
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes --no-install-recommends \ | ||
slapd ldap-utils \ | ||
&& rm -rf /var/lib/ldap /etc/ldap/slapd.d | ||
|
||
# Add service directory to /osixia | ||
ADD service /osixia | ||
# Add service directory to /container/service | ||
ADD service /container/service | ||
|
||
# Use baseimage service auto-install script and clean all | ||
RUN ./sbin/auto-install && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* | ||
# Use baseimage install-service script and clean all | ||
# https:/osixia/docker-light-baseimage/blob/stable/image/tool/install-service | ||
RUN /container/tool/install-service \ | ||
&& apt-get clean \ | ||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* | ||
|
||
# Add default env variables | ||
ADD env.yml /etc/env.yml | ||
ADD env.yaml /etc/env.yaml | ||
|
||
# Set OpenLDAP data and config directories in a data volume | ||
VOLUME ["/var/lib/ldap", "/etc/ldap/slapd.d"] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions
5
image/service/slapd/assets/config/bootstrap/ldif/03-memberOf.ldif
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# Load memberof module | ||
dn: cn=module{0},cn=config | ||
changetype: modify | ||
add: olcModuleLoad | ||
olcModuleLoad: memberof |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
image/service/slapd/assets/config/bootstrap/ldif/logging.ldif
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
Add your ssl crt, key and ca crt here | ||
or during docker run mount a data volume with thoses files to /osixia/slapd/assets/ssl | ||
or during docker run mount a data volume with thoses files to /container/service/slapd/assets/ssl |
File renamed without changes.
Oops, something went wrong.