diff --git a/Makefile b/Makefile index fce1e81..b1457ec 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ ################################ IMAGE_REPO := reg.cadoles.com/cadoles -IMAGE_VERSION ?= 0.0.1 +IMAGE_VERSION ?= 0.0.2 DAY_SUFFIX_TAG ?= $(shell date +%Y%m%d) diff --git a/files/images/sp-shibboleth/base/Dockerfile b/files/images/sp-shibboleth/base/Dockerfile index 5df0f69..f421382 100644 --- a/files/images/sp-shibboleth/base/Dockerfile +++ b/files/images/sp-shibboleth/base/Dockerfile @@ -1,14 +1,19 @@ -FROM reg.cadoles.com/proxy_cache/library/debian:stable-slim +FROM reg.cadoles.com/proxy_cache/library/debian:bookworm-slim RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update -y && \ - apt-get install -y libapache2-mod-shib php-fpm + apt-get update -y && apt-get upgrade -y + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get install -y libapache2-mod-shib php-fpm curl RUN a2enmod rewrite expires headers remoteip ssl \ proxy proxy_fcgi proxy_http proxy_balancer \ lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic lbmethod_heartbeat +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get clean -y + EXPOSE 80 COPY files/common/healthcheck /usr/local/share/cadoles/healthcheck @@ -24,4 +29,4 @@ ONBUILD ARG ADDITIONAL_PACKAGES ONBUILD ARG INSTALL_DEPENDENCIES ONBUILD ARG INSTALL_COMPOSER_DEPENDENCIES ONBUILD ARG INSTALL_NPM_DEPENDENCIES -ONBUILD RUN . /usr/local/share/cadoles/scripts/install-dependencies.sh +ONBUILD RUN bash /usr/local/share/cadoles/scripts/install-dependencies.sh