UNCLASSIFIED

Commit 8c8e9469 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

Development

See merge request !50
parents 251d358e eb387e18
Pipeline #445955 failed with stages
in 39 minutes and 57 seconds
......@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG BASE_TAG=1.11
FROM jboss/keycloak:14.0.0 AS builder
FROM jboss/keycloak:15.0.0 AS builder
COPY --chown=jboss:root scripts/ /opt/jboss/tools
......@@ -14,7 +14,7 @@ RUN ${JBOSS_HOME}/bin/jboss-cli.sh --file=/opt/jboss/tools/cli/remove-datasource
# This is the base image
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ENV KEYCLOAK_VERSION="14.0.0" \
ENV KEYCLOAK_VERSION="15.0.0" \
JDBC_POSTGRES_VERSION="42.2.5" \
JDBC_MARIADB_VERSION="2.5.4" \
JDBC_MSSQL_VERSION="8.2.2.jre11" \
......
......@@ -8,7 +8,7 @@ name: "opensource/keycloak/keycloak"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "14.0.0"
- "15.0.0"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://www.keycloak.org"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Red Hat"
org.opencontainers.image.version: "14.0.0"
org.opencontainers.image.version: "15.0.0"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "auth,idam,sso"
## This value can be "opensource" or "commercial"
......@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context
resources:
- tag: jboss/keycloak:14.0.0
url: docker://docker.io/jboss/keycloak@sha256:00bf91597ffef4811c1b08cc88710d078e0b936a4ab473ced8a7abf34ee24fb8
- tag: jboss/keycloak:15.0.0
url: docker://docker.io/jboss/keycloak@sha256:d73612f2a587065b54f6216f8a274a82bbfbf8e50fa5a3567aa493e1b4387c29
# List of project maintainers
maintainers:
......@@ -46,3 +46,7 @@ maintainers:
username: "sean.melissari"
email: "melissari_sean@bah.com"
cht_member: true
- email: "klepal_alexander@bah.com"
name: "Alexander Klepal"
username: "alexander.klepal"
cht_member: true
......@@ -13,6 +13,7 @@
"packageNames": [
"jboss/keycloak"
],
"separateMinorPatch": true,
"major": {
"enabled": true
}
......
Markdown is supported
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