Commit 8f3286ec authored by Sandro Mathys's avatar Sandro Mathys
Browse files

improve Dockerfile syntax

parent b5cac96d
...@@ -8,29 +8,29 @@ ENV DEBIAN_FRONTEND=noninteractive ...@@ -8,29 +8,29 @@ ENV DEBIAN_FRONTEND=noninteractive
COPY SWITCHaai-swdistrib.gpg kubernetes-archive-keyring.gpg /usr/share/keyrings/ COPY SWITCHaai-swdistrib.gpg kubernetes-archive-keyring.gpg /usr/share/keyrings/
# ca-certificates is required to access the kubernetes repo, thus the double dip # 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; \ 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; \ 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 update&& \
apt-get install -y --no-install-recommends ca-certificates; \ apt-get install -y --no-install-recommends ca-certificates&& \
apt-get update; \ apt-get update&& \
apt-get install -y --no-install-recommends apache2 shibboleth libapache2-mod-shib openssl kubectl; \ apt-get install -y --no-install-recommends apache2 shibboleth libapache2-mod-shib openssl kubectl&& \
apt-get clean; \ apt-get clean&& \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*&& \
rm -rf /etc/apache2/conf-available; \ rm -rf /etc/apache2/conf-available&& \
rm -rf /etc/apache2/conf-enabled; \ rm -rf /etc/apache2/conf-enabled&& \
rm -rf /etc/apache2/mods-available; \ rm -rf /etc/apache2/mods-available&& \
rm -rf /etc/apache2/mods-enabled; \ rm -rf /etc/apache2/mods-enabled&& \
rm -rf /etc/apache2/sites-available; \ rm -rf /etc/apache2/sites-available&& \
rm -rf /etc/apache2/sites-enabled; \ rm -rf /etc/apache2/sites-enabled&& \
rm -rf /etc/apache2/apache2.conf; \ rm -rf /etc/apache2/apache2.conf&& \
rm -rf /etc/apache2/ports.conf; \ rm -rf /etc/apache2/ports.conf&& \
rm -f /etc/shibboleth/attribute-map.xml; \ rm -f /etc/shibboleth/attribute-map.xml&& \
rm -f /etc/shibboleth/attribute-policy.xml; \ rm -f /etc/shibboleth/attribute-policy.xml&& \
rm -f /etc/shibboleth/shibboleth2.xml; \ rm -f /etc/shibboleth/shibboleth2.xml&& \
rm -f /etc/shibboleth/example-*; \ rm -f /etc/shibboleth/example-*&& \
rm -f /etc/shibboleth/*.logger; \ rm -f /etc/shibboleth/*.logger&& \
rm -rf /var/log/*; \ rm -rf /var/log/*&& \
ln -sf /usr/lib/apache2/modules /etc/apache2/modules; \ ln -sf /usr/lib/apache2/modules /etc/apache2/modules&& \
ln -sf /dev/shm /etc/apache2/run ln -sf /dev/shm /etc/apache2/run
# https://www.switch.ch/aai/guides/sp/configuration/#setupprofile # 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