Skip to content

Commit baf02df

Browse files
committed
Reorganized Trunk containers
1 parent 678e552 commit baf02df

File tree

5 files changed

+114
-105
lines changed

5 files changed

+114
-105
lines changed

Dockerfile-trunk

Lines changed: 0 additions & 48 deletions
This file was deleted.

Dockerfile-trunk-nginx

Lines changed: 0 additions & 57 deletions
This file was deleted.

docker-trunk/apache2/Dockerfile

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Dockerfile for LemonLDAP::NG
2+
# Installation of trunk version of LL::NG
3+
4+
# Start from Debian Jessie
5+
FROM debian:jessie
6+
MAINTAINER Clément OUDOT
7+
LABEL name="llng-apache2-trunk" \
8+
version="v0.0.1"
9+
10+
# Change SSO DOMAIN here
11+
ENV SSODOMAIN example.com
12+
13+
# Update system
14+
RUN apt -y update \
15+
&& apt -y upgrade \
16+
&& echo "# Install LL::NG dependencies" \
17+
&& apt -y install apache2 libapache2-mod-perl2 libapache2-mod-fcgid \
18+
libapache-session-perl libnet-ldap-perl libcache-cache-perl \
19+
libdbi-perl perl-modules libwww-perl libcache-cache-perl \
20+
libxml-simple-perl libsoap-lite-perl libhtml-template-perl \
21+
libregexp-assemble-perl libjs-jquery libxml-libxml-perl \
22+
libcrypt-rijndael-perl libio-string-perl libxml-libxslt-perl \
23+
libconfig-inifiles-perl libjson-perl libstring-random-perl \
24+
libemail-date-format-perl libmime-lite-perl libcrypt-openssl-rsa-perl \
25+
libdigest-hmac-perl libclone-perl libauthen-sasl-perl \
26+
libnet-cidr-lite-perl libcrypt-openssl-x509-perl libauthcas-perl \
27+
libtest-pod-perl libtest-mockobject-perl libauthen-captcha-perl \
28+
libnet-openid-consumer-perl libnet-openid-server-perl \
29+
libunicode-string-perl libconvert-pem-perl libmouse-perl libplack-perl \
30+
libglib-perl liblasso-perl yui-compressor dh-systemd \
31+
&& echo "# Install vim to edit files" \
32+
&& apt-get -y install vim \
33+
&& echo "# Install subversion client and compilaton tools" \
34+
&& apt-get -y install subversion make devscripts \
35+
&& cd /root \
36+
&& echo "# Get trunk version of LL::NG" \
37+
&& svn co svn://svn.forge.objectweb.org/svnroot/lemonldap/trunk lemonldap \
38+
&& echo "# Install LL::NG" \
39+
&& cd lemonldap \
40+
&& make debian-install-for-apache \
41+
&& echo "# Change SSO Domain" \
42+
&& sed -i "s/example\.com/${SSODOMAIN}/g" /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/lmConf-1.js /var/lib/lemonldap-ng/test/index.pl \
43+
&& echo "# Set debug mode" \
44+
&& sed -i "s/logLevel\s*=\s*warn/logLevel = debug/" /etc/lemonldap-ng/lemonldap-ng.ini \
45+
&& sed -i "s/LogLevel warn/LogLevel debug/" /etc/apache2/apache2.conf \
46+
&& echo "# Enable sites" \
47+
&& a2ensite handler-apache2.conf portal-apache2.conf manager-apache2.conf test-apache2.conf \
48+
&& a2enmod fcgid perl alias rewrite \
49+
&& echo "# Remove cached configuration" \
50+
&& rm -rf /tmp/lemonldap-ng-config \
51+
&& apt clean \
52+
&& rm -fr /var/lib/apt/lists/*
53+
54+
EXPOSE 80 443
55+
VOLUME ["/var/log/apache2", "/etc/apache2", "/etc/lemonldap-ng", "/var/lib/lemonldap-ng/conf", "/var/lib/lemonldap-ng/sessions", "/var/lib/lemonldap-ng/psessions"]
56+
ENTRYPOINT ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

docker-trunk/nginx/Dockerfile

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Dockerfile for LemonLDAP::NG
2+
# Installation of trunk version of LL::NG
3+
4+
# Start from Debian Jessie
5+
FROM debian:jessie
6+
MAINTAINER Xavier Guimard
7+
LABEL name="llng-nginx-trunk" \
8+
version="v0.0.1"
9+
10+
# Change SSO DOMAIN here
11+
ENV SSODOMAIN example.com
12+
13+
COPY etc.supervisor.conf.d.supervisord.conf /
14+
15+
# Update system and install LL::NG dependencies
16+
RUN apt-get -y update \
17+
&& apt-get -y upgrade \
18+
&& apt-get -y install nginx-extras supervisor libapache-session-perl libnet-ldap-perl \
19+
libcache-cache-perl libdbi-perl perl-modules libwww-perl libcache-cache-perl \
20+
libxml-simple-perl libsoap-lite-perl libhtml-template-perl \
21+
libregexp-assemble-perl libjs-jquery libxml-libxml-perl libcrypt-rijndael-perl \
22+
libio-string-perl libxml-libxslt-perl libconfig-inifiles-perl libjson-perl \
23+
libstring-random-perl libemail-date-format-perl libmime-lite-perl \
24+
libcrypt-openssl-rsa-perl libdigest-hmac-perl libclone-perl libauthen-sasl-perl \
25+
libnet-cidr-lite-perl libcrypt-openssl-x509-perl libauthcas-perl libtest-pod-perl \
26+
libtest-mockobject-perl libauthen-captcha-perl libnet-openid-consumer-perl \
27+
libnet-openid-server-perl libunicode-string-perl libconvert-pem-perl \
28+
libmouse-perl libplack-perl libglib-perl liblasso-perl yui-compressor dh-systemd \
29+
vim subversion make devscripts libdbd-sqlite3-perl libemail-sender-perl \
30+
libgd-securityimage-perl libimage-magick-perl \
31+
&& rm -rf /var/lib/apt/lists/* \
32+
&& echo "# Get trunk version of LL::NG" \
33+
&& cd /root \
34+
&& svn co svn://svn.forge.objectweb.org/svnroot/lemonldap/trunk lemonldap \
35+
&& echo "# Install LL::NG" \
36+
&& cd lemonldap \
37+
&& make debian-install-for-nginx
38+
&& rm -rf /tmp/*lemonldap* /root/lemonldap/* \
39+
&& mv /etc.supervisor.conf.d.supervisord.conf /etc/supervisor/conf.d/supervisord.conf \
40+
&& echo "# Change SSO Domain" \
41+
&& sed -i "s/example\.com/${SSODOMAIN}/g" /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/lmConf-1.js /var/lib/lemonldap-ng/test/index.pl \
42+
&& echo "# Set debug mode" \
43+
&& sed -i "s/logLevel\s*=\s*warn/logLevel = debug/" /etc/lemonldap-ng/lemonldap-ng.ini \
44+
&& echo "# Enable sites" \
45+
&& cd /etc/nginx/sites-enabled \
46+
&& ln -s ../sites-available/portal-nginx.conf \
47+
&& ln -s ../sites-available/manager-nginx.conf \
48+
&& ln -s ../sites-available/handler-nginx.conf \
49+
&& ln -s ../sites-available/test-nginx.conf \
50+
&& echo "# Enable headers and custom logs" \
51+
&& perl -i -pe 's/#// if(/nginx-lua-headers/)' /etc/lemonldap-ng/test-nginx.conf \
52+
&& perl -i -pe 's/#// if(/access\.log/)' /etc/lemonldap-ng/handler-nginx.conf \
53+
&& echo "# No daemon" \
54+
&& echo "\ndaemon off;" >> /etc/nginx/nginx.conf
55+
56+
EXPOSE 80 443
57+
VOLUME ["/var/log/nginx", "/etc/apache2", "/etc/lemonldap-ng", "/var/lib/lemonldap-ng/conf", "/var/lib/lemonldap-ng/sessions", "/var/lib/lemonldap-ng/psessions"]
58+
ENTRYPOINT ["/usr/bin/supervisord"]

supervisord.conf renamed to docker-trunk/nginx/etc.supervisor.conf.d.supervisord.conf

File renamed without changes.

0 commit comments

Comments
 (0)