Commit 9ebe4aa2 authored by Sandro Mathys's avatar Sandro Mathys
Browse files

add kubectl to docker image

parent d14dd7df
......@@ -9,7 +9,7 @@ fullnameOverride: ""
image:
repository: "cr.gitlab-int.switch.ch/maps/shibboleth-sp-helm-chart/image/shibboleth-sp"
pullPolicy: IfNotPresent
tag: "0.1.1"
tag: "0.2.0"
# Specify all secret(s) required to pull the images used for this installation.
# imagePullSecrets:
......
......@@ -3,11 +3,17 @@ FROM cr.gitlab-int.switch.ch/maps/shibboleth-sp-helm-chart/ubuntu:focal
ENV DEBIAN_FRONTEND=noninteractive
# https://pkg.switch.ch/switchaai/SWITCHaai-swdistrib.gpg
COPY SWITCHaai-swdistrib.gpg /usr/share/keyrings/SWITCHaai-swdistrib.gpg
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
# 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; \
apt-get install -y --no-install-recommends apache2 shibboleth libapache2-mod-shib openssl; \
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; \
apt-get clean; \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
rm -rf /etc/apache2/conf-available; \
......
Supports Markdown
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