Unverified Commit 2e2269cc authored by William Tucker's avatar William Tucker Committed by GitHub
Browse files

Merge pull request #266 from ESGF/dev 

Updates to base images and Java.
parents 07347476 3b689c96

.gitlab-ci.yml

+0 −7
Original line number Diff line number Diff line
@@ -154,13 +154,6 @@ build:tomcat: 
    CONTEXT_DIR: $CI_PROJECT_DIR/images/tomcat

  needs: ["build:jre"]



build:keycloak:

  extends: .docker-build

  stage: build-3

  variables:

    CONTEXT_DIR: $CI_PROJECT_DIR/images/keycloak

  needs: ["build:jdk"]



build:python-build:

  extends: .docker-build

  stage: build-3

images/base/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
## Currently just a fully-updated CentOS 7 with common packages and entrypoint

#####



FROM rockylinux:9.2.20230513

FROM rockylinux:9



# Create the esgf user that will be used to run apps

ENV ESGF_UID 1000
@@ -26,7 +26,7 @@ ENV LC_ALL en_US.UTF-8 


# Upgrade all existing packages

# Updating CACHE_BUST to the current time will bust the cache and force a rebuild

RUN CACHE_BUST="20220923"; \

RUN CACHE_BUST="20251028"; \

    dnf makecache && dnf upgrade -y && dnf clean all



# Install ca-certificates and openssl

images/jdk/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN dnf makecache && \

    dnf install -y java-11-openjdk-devel-11.0.23.0.9-3.el9 && \

    dnf install -y java-11-openjdk-devel && \

    dnf clean all

images/jre/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN dnf makecache && \

    dnf install -y java-11-openjdk-headless-11.0.23.0.9-3.el9 && \

    dnf install -y java-21-openjdk-headless && \

    dnf clean all



USER $ESGF_UID

images/keycloak/Dockerfile

deleted100755 → 0
+0 −46
Original line number Diff line number Diff line 
#####

## Base image for Keycloak

#####



ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest



ARG KEYCLOAK_VERSION=19.0.3

ARG KEYCLOAK_SHA1=d438c185177d3bacf5b20580d3506c4971283d3d

ARG KEYCLOAK_DIST=https://github.com/keycloak/keycloak/releases/download/$KEYCLOAK_VERSION/keycloak-$KEYCLOAK_VERSION.tar.gz





FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as build-env



# Redeclare the ARGs that are required from the global scope

ARG KEYCLOAK_VERSION

ARG KEYCLOAK_SHA1

ARG KEYCLOAK_DIST



ADD $KEYCLOAK_DIST /tmp/keycloak/



RUN (cd /tmp/keycloak && \

    echo "$KEYCLOAK_SHA1 *keycloak-$KEYCLOAK_VERSION.tar.gz" | sha1sum --strict --check && \

    tar -xvf /tmp/keycloak/keycloak-*.tar.gz && \

    rm /tmp/keycloak/keycloak-*.tar.gz) || true



RUN mv /tmp/keycloak/keycloak-* /opt/keycloak



RUN chmod -R g+rwX /opt/keycloak





FROM ${ESGF_REPOSITORY_BASE}/jre:${ESGF_IMAGES_VERSION} as builder



COPY --from=build-env --chown=$ESGF_UID:0 /opt/keycloak /opt/keycloak



# Keycloak runs as the ESGF user

USER $ESGF_UID



EXPOSE 8080

EXPOSE 8443



# Use the custom entrypoint to correctly apply settings before Keycloak is run

CMD [ \

    "/opt/keycloak/bin/kc.sh", \

    "start" \

]