Commit 241c6f73 authored by Sandro Mathys's avatar Sandro Mathys
Browse files

improve Dockerfile slightly

parent c6b306a6
......@@ -6,12 +6,11 @@ ENV DEBIAN_FRONTEND=noninteractive
# https://pkg.switch.ch/switchaai/SWITCHaai-swdistrib.gpg
# https://packages.cloud.google.com/apt/doc/apt-key.gpg
COPY SWITCHaai-swdistrib.gpg kubernetes-archive-keyring.gpg /usr/share/keyrings/
# kubernetes does not currently support ubuntu focal :(
RUN echo "deb [signed-by=/usr/share/keyrings/SWITCHaai-swdistrib.gpg] http://pkg.switch.ch/switchaai/ubuntu focal main" > /etc/apt/sources.list.d/SWITCHaai-swdistrib.list; \
echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list
# ca-certificates is required to access the kubernetes repo
RUN apt-get update; \
# ca-certificates is required to access the kubernetes repo, thus the double dip
RUN echo "deb [signed-by=/usr/share/keyrings/SWITCHaai-swdistrib.gpg] http://pkg.switch.ch/switchaai/ubuntu focal main" > /etc/apt/sources.list.d/SWITCHaai-swdistrib.list; \
echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list; \
apt-get update; \
apt-get install -y --no-install-recommends ca-certificates; \
apt-get update; \
apt-get install -y --no-install-recommends apache2 shibboleth libapache2-mod-shib openssl kubectl; \
......@@ -30,9 +29,8 @@ RUN apt-get update; \
rm -f /etc/shibboleth/shibboleth2.xml; \
rm -f /etc/shibboleth/example-*; \
rm -f /etc/shibboleth/*.logger; \
rm -rf /var/log/*
RUN ln -sf /usr/lib/apache2/modules /etc/apache2/modules; \
rm -rf /var/log/*; \
ln -sf /usr/lib/apache2/modules /etc/apache2/modules; \
ln -sf /dev/shm /etc/apache2/run
# https://www.switch.ch/aai/guides/sp/configuration/#setupprofile
......
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