|
|
@@ -1,14 +1,14 @@
|
|
|
-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"]
|
|
|
+CMD ["/sbin/auto_init"]
|
|
|
|
|
|
# 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 \
|
|
|
+RUN apt-get -y update && /sbin/install-service-available ssl-helper-gnutls \
|
|
|
&& 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
|
|
|
@@ -16,8 +16,8 @@ RUN apt-get -y update && /sbin/enable-service ssl-kit \
|
|
|
# Add service directory to /osixia
|
|
|
ADD service /osixia
|
|
|
|
|
|
-# 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
|
|
|
+RUN ./sbin/install-service && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
|
|
|
|
|
# Add default env variables
|
|
|
ADD env.yml /etc/env.yml
|
Bertrand Gouny