Commit 53ad9910 authored by Davide Vaghetti's avatar Davide Vaghetti
Browse files

Merge branch 'master' into 'master'

Master

See merge request !1
parents b91f7602 afecfcdc
......@@ -11,9 +11,16 @@ RUN echo $FAAS_SHIB_VERSION > /faas-docker-version
COPY ./conf/etc/apt/sources.list /etc/apt/sources.list
RUN apt-get -q update && \
apt-get install -y --no-install-recommends apt-utils curl vim rsyslog && \
apt-get install -y libapache2-mod-shib shibboleth-sp-utils shibboleth-sp-common && \
apt-get install -y --no-install-recommends apt-utils && \
apt-get install -y --no-install-recommends curl vim rsyslog mc && \
apt-get install -y apache2 libapache2-mod-shib shibboleth-sp-utils shibboleth-sp-common && \
apt-get --yes install supervisor && \
apt-get clean
#ENTRYPOINT ["/etc/entrypoint"]
COPY ./conf/etc/supervisord.conf /etc/supervisord.conf
COPY ./conf/etc/entrypoint /etc/entrypoint
EXPOSE 80
ENTRYPOINT ["/etc/entrypoint"]
......@@ -16,7 +16,7 @@ run: # run container
docker run -i -t --detach --rm --env-file=$(config) --name="${FAAS_SMTP_NAME}" ${FAAS_SHIB_IMAGE}
run-nd: # run container in no-deamon mode
docker run -i -t --rm --env-file=$(config) --name="${FAAS_SHIB_NAME}" ${FAAS_SHIB_IMAGE}
docker run -i -t --rm --env-file=$(config) -p 9080:80 --name="${FAAS_SHIB_NAME}" ${FAAS_SHIB_IMAGE}
up: build run # build and run container
......
deb http://deb.debian.org/debian buster main
deb-src http://deb.debian.org/debian buster main
# deb http://snapshot.debian.org/archive/debian/20210111T000000Z buster main
deb http://deb.debian.org/debian testing main
# deb http://snapshot.debian.org/archive/debian-security/20210111T000000Z buster/updates main
......
#! /bin/bash
sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
/usr/sbin/shib-keygen -n sp-encrypt
/usr/sbin/shib-keygen -n sp-signing
exec supervisord -c /etc/supervisord.conf
[supervisord]
user = root
nodaemon = true
logfile = /dev/null
logfile_maxbytes= 0
[program:rsyslog]
command = rsyslogd -n
autostart = true
autorestart = true
startsecs = 2
stopwaitsecs = 2
stdout_logfile = /dev/stdout
stderr_logfile = /dev/stderr
stdout_logfile_maxbytes = 0
stderr_logfile_maxbytes = 0
priority = 1
[program:apache2]
command = /etc/init.d/apache2 start
autostart = true
autorestart = false
directory = /var
startsecs = 0
priority = 2
[program:shibd]
command = /etc/init.d/shibd start
autostart = true
autorestart = false
directory = /var
startsecs = 0
priority = 3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment