Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump versoins using latest ldap fixing unittest #1

Merged
merged 1 commit into from
Jan 13, 2021
Merged

bump versoins using latest ldap fixing unittest #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM alpine:3.6
FROM alpine:3.12
LABEL maintainer Pierre Verkest <pierreverkest84@gmail.com>

ENV OPENLDAP_VERSION 2.4.44-r5
#ENV OPENLDAP_VERSION 2.4.45-r3
ENV OPENLDAP_VERSION 2.4.50-r1

# TODO: make sure those dependencies (openssl gnutls nss cyrus-sasl krb5) are
# runtime requirement, I'm (Pierre V.) not sure if the documentation
Expand All @@ -15,10 +14,13 @@ ENV OPENLDAP_VERSION 2.4.44-r5
# openssl gnutls nss cyrus-sasl krb5
RUN adduser -D -H -u 666 ldap \
&& apk add --update \
openldap=$OPENLDAP_VERSION \
dumb-init \
openldap=$OPENLDAP_VERSION \
openldap-back-mdb \
openldap-overlay-memberof \
openldap-overlay-refint \
openldap-overlay-ppolicy \
dumb-init \
&& rm -rf /var/cache/apk/* \
&& rm /etc/openldap/*.default \
&& rm /etc/openldap/*.example \
&& rm /etc/openldap/*.ldif \
&& rm /etc/openldap/*.conf \
Expand All @@ -32,7 +34,8 @@ VOLUME ["/etc/openldap/slapd.d", "/var/lib/openldap/"]

RUN chmod 500 /etc/openldap/*.ldif.template.sh \
&& chmod 700 /entrypoint.sh \
&& chown ldap:ldap -R /var/lib/openldap/run/
&& mkdir -p /run/openldap/ \
&& chown ldap:ldap -R /run/openldap/

EXPOSE 389 636

Expand Down
13 changes: 7 additions & 6 deletions etc/slapd.ldif.template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ CIPHER=${CIPHER:-DEFAULT}

cat << EOF
#
# See slapd-config(5) for details on configuration options.
# See slapd.conf(5) for details on configuration options.
# This file should NOT be world readable.
#
dn: cn=config
Expand All @@ -69,8 +69,8 @@ $CA_PATH
#
# Define global ACLs to disable default read access.
#
olcArgsFile: /var/lib/openldap/run/slapd.args
olcPidFile: /var/lib/openldap/run/slapd.pid
olcPidFile: /run/openldap/slapd.pid
olcArgsFile: /run/openldap/slapd.args
#
# Do not enable referrals until AFTER you have a working directory
# service AND an understanding of referrals.
Expand All @@ -88,9 +88,10 @@ objectClass: olcModuleList
objectClass: top
cn: module
olcModulepath: /usr/lib/openldap
olcModuleload: memberof
olcModuleload: refint
olcModuleload: ppolicy
olcModuleload: memberof.so
olcModuleload: refint.so
olcModuleload: ppolicy.so
olcModuleload: back_mdb.so

dn: cn=schema,cn=config
objectClass: olcSchemaConfig
Expand Down
6 changes: 3 additions & 3 deletions tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM python:3-alpine3.6
FROM python:3.6-alpine
LABEL maintainer Pierre Verkest <pverkest@anybox.fr>

RUN apk add --update \
openldap-clients \
dumb-init \
openldap-clients \
dumb-init \
&& rm -rf /var/cache/apk/* \
&& mkdir -p /usr/src/app

Expand Down