Unverified Commit 1ca3b304 authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge pull request #175 from ESGF/keycloak-18-image 

Keycloak 18 image
parents b27e2601 74daa7a8

.gitlab-ci.yml

+7 −0
Original line number Diff line number Diff line
@@ -144,6 +144,13 @@ 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/keycloak/Dockerfile

0 → 100755
+46 −0
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" \

]

images/thredds/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder 


# Unpack the THREDDS war

ARG THREDDS_VERSION=5.5

ARG THREDDS_SHA1=e8643f8600124937d9529bffc7e9622ff1d936ae

ARG THREDDS_SHA1=04ebd7193c98c924e7c5d26aaf69d082b4926af2

ARG THREDDS_URL=https://downloads.unidata.ucar.edu/tds/$THREDDS_VERSION/thredds-$THREDDS_VERSION-SNAPSHOT.war

RUN mkdir /application && \

    cd /application && \