Commit 6bf4145a authored by William Tucker's avatar William Tucker
Browse files

Merge branch 'issue/118/keycloak-image' of https://github.com/ESGF/esgf-docker...

Merge branch 'issue/118/keycloak-image' of https://github.com/ESGF/esgf-docker into issue/154/idp-proxy-image
parents 73fa16c6 5c6c95b5
Loading
Loading
Loading
Loading
+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 yum makecache && \
    yum install -y java-1.8.0-openjdk-devel-1.8.0.262.b10 && \
    yum install -y java-1.8.0-openjdk-devel-1.8.0.272.b10 && \
    yum clean all
+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 yum makecache && \
    yum install -y java-1.8.0-openjdk-headless-1.8.0.262.b10 && \
    yum install -y java-1.8.0-openjdk-headless-1.8.0.272.b10 && \
    yum clean all

USER $ESGF_UID
+11 −5
Original line number Diff line number Diff line
@@ -14,16 +14,19 @@ ARG JDBC_MYSQL_VERSION=8.0.19
ARG JDBC_MARIADB_VERSION=2.5.4
ARG JDBC_MSSQL_VERSION=7.4.1.jre11

# Keycloak's image repository containing build and run scripts
ARG GIT_REPOSITORY=
ARG GIT_VERSION=${KEYCLOAK_VERSION}


FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} as keycloak-containers-source

# Keycloak's image repository containing build and run scripts
ARG GIT_REPOSITORY=https://github.com/keycloak/keycloak-containers
ARG GIT_VERSION=${KEYCLOAK_VERSION}
USER root
ARG KEYCLOAK_VERSION

# Install Git and clone the repository
# Install Git and clone the keycloak container repository
RUN yum makecache && yum install -y git && yum clean all
RUN git clone --single-branch --b $GIT_VERSION $GIT_REPOSITORY /source
RUN git clone --single-branch -b $KEYCLOAK_VERSION https://github.com/keycloak/keycloak-containers /source


FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as keycloak-build
@@ -32,6 +35,9 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as keycloak-build
ARG KEYCLOAK_VERSION
ARG KEYCLOAK_DIST
ARG JDBC_POSTGRES_VERSION
ARG JDBC_MYSQL_VERSION
ARG JDBC_MARIADB_VERSION
ARG JDBC_MSSQL_VERSION

# Environment variables used by the build script
ENV LAUNCH_JBOSS_IN_BACKGROUND 1
+64 −0
Original line number Diff line number Diff line
#
# JBoss, Home of Professional Open Source.
# Copyright 2013, Red Hat, Inc., and individual contributors
# as indicated by the @author tags. See the copyright.txt file in the
# distribution for a full listing of individual contributors.
#
# This is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of
# the License, or (at your option) any later version.
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this software; if not, write to the Free
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#

# Additional loggers to configure (the root logger is always configured)
loggers=com.arjuna,io.jaegertracing.Configuration,org.jboss.as.config,sun.rmi

logger.level=INFO
logger.handlers=CONSOLE,FILE

logger.com.arjuna.level=WARN
logger.com.arjuna.useParentHandlers=true

logger.io.jaegertracing.Configuration.level=WARN
logger.io.jaegertracing.Configuration.useParentHandlers=true

logger.org.jboss.as.config.level=DEBUG
logger.org.jboss.as.config.useParentHandlers=true

logger.sun.rmi.level=WARN
logger.sun.rmi.useParentHandlers=true

handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.level=INFO
handler.CONSOLE.formatter=COLOR-PATTERN
handler.CONSOLE.properties=autoFlush,target
handler.CONSOLE.autoFlush=true
handler.CONSOLE.target=SYSTEM_OUT

handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
handler.FILE.level=ALL
handler.FILE.formatter=PATTERN
handler.FILE.properties=autoFlush,append,fileName,suffix
handler.FILE.constructorProperties=fileName,append
handler.FILE.autoFlush=true
handler.FILE.append=true
handler.FILE.fileName=${org.jboss.boot.log.file:server.log}
handler.FILE.suffix=.yyyy-MM-dd

formatter.COLOR-PATTERN=org.jboss.logmanager.formatters.PatternFormatter
formatter.COLOR-PATTERN.properties=pattern
formatter.COLOR-PATTERN.pattern=%K{level}%d{HH\:mm\:ss,SSS} %-5p [%c] (%t) %s%e%n

formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
formatter.PATTERN.properties=pattern
formatter.PATTERN.pattern=%d{yyyy-MM-dd HH\:mm\:ss,SSS} %-5p [%c] (%t) %s%e%n
+632 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading