UNCLASSIFIED

Commit 1a956c3c authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !42
parents 1161e963 7a3ce1bc
Pipeline #374457 passed with stages
in 28 minutes and 19 seconds
ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG BASE_TAG=1.11 ARG BASE_TAG=1.11
FROM jboss/keycloak:13.0.1 AS builder FROM jboss/keycloak:14.0.0 AS builder
COPY --chown=jboss:root scripts/ /opt/jboss/tools 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 ...@@ -14,7 +14,7 @@ RUN ${JBOSS_HOME}/bin/jboss-cli.sh --file=/opt/jboss/tools/cli/remove-datasource
# This is the base image # This is the base image
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ENV KEYCLOAK_VERSION="13.0.1" \ ENV KEYCLOAK_VERSION="14.0.0" \
JDBC_POSTGRES_VERSION="42.2.5" \ JDBC_POSTGRES_VERSION="42.2.5" \
JDBC_MARIADB_VERSION="2.5.4" \ JDBC_MARIADB_VERSION="2.5.4" \
JDBC_MSSQL_VERSION="8.2.2.jre11" \ JDBC_MSSQL_VERSION="8.2.2.jre11" \
......
...@@ -8,7 +8,7 @@ name: "opensource/keycloak/keycloak" ...@@ -8,7 +8,7 @@ name: "opensource/keycloak/keycloak"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "13.0.1" - "14.0.0"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://www.keycloak.org" org.opencontainers.image.url: "https://www.keycloak.org"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Red Hat" org.opencontainers.image.vendor: "Red Hat"
org.opencontainers.image.version: "13.0.1" org.opencontainers.image.version: "14.0.0"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "auth,idam,sso" mil.dso.ironbank.image.keywords: "auth,idam,sso"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -37,8 +37,8 @@ labels: ...@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- tag: jboss/keycloak:13.0.1 - tag: jboss/keycloak:14.0.0
url: docker://docker.io/jboss/keycloak@sha256:e2a216ff6dc3f9ba88d77132c930f8e15dd50ebca1ead6e21696f61b22f0ee10 url: docker://docker.io/jboss/keycloak@sha256:ca713e87ad163da71ab329010de2464a41ff030a25ae0aef15c1c290252f3d7f
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
...@@ -9,6 +9,8 @@ if [[ -d "$ENTRYPOINT_DIR" ]]; then ...@@ -9,6 +9,8 @@ if [[ -d "$ENTRYPOINT_DIR" ]]; then
if [[ "$f" == *.cli ]]; then if [[ "$f" == *.cli ]]; then
echo "Executing cli script: $f" echo "Executing cli script: $f"
bin/jboss-cli.sh --file="$f" bin/jboss-cli.sh --file="$f"
elif [[ -d "$f" ]]; then
echo "Skipping execution of directory: $f"
elif [[ -x "$f" ]]; then elif [[ -x "$f" ]]; then
echo "Executing: $f" echo "Executing: $f"
"$f" "$f"
......
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