libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

[KEYCLOAK-13207] Derive the value of the JBOSS_IMAGE_NAME information

Browse source 
environment variable from the image stream name instead of using a
hardcoded value

Derive the value of the JBOSS_IMAGE_VERSION information environment
variable from the "project_versionDoc" attribute instead of using
a hardcoded value, since the current "project_versionDoc" value matches
the "7.4" value currently present in the images

Drop the "JBOSS_IMAGE_RELEASE" and "STI_BUILDER" information environment
variables, since they aren't present in the latest version(s) of the
OpenJDK / OpenJ9 images any more

Add raw GitHub locations of the OpenJDK and OpenJ9 RH-SSO 7.4 templates
to be ignored by the tests (currently there are just RH-SSO 7.3 and
RH-SSO CD versions of these)

Signed-off-by: Jan Lieskovsky <jlieskov@redhat.com>
This commit is contained in:
Jan Lieskovsky 2020-07-29 16:47:10 +02:00 committed by Stian Thorgersen
parent 3cb7335dd2
commit 88a8c657af
6 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openshift-openj9/master.adoc
View file

@ -8,7 +8,8 @@ include::topics/templates/document-attributes-product.adoc[]
:project_templates_version: {openshift_openj9_project_templates_version}
:openshift_name: {openshift_openj9_name}
:openshift_link: {openshift_openj9_link}
:openshift_image: {openshift_openj9_image}
:openshift_image_repository: {openshift_openj9_image_repository}
:openshift_image_stream: {openshift_openj9_image_stream}
:openshift_image_platforms: {openshift_openj9_platforms}
:openshift_name_other: {openshift_openjdk_name}
:openshift_link_other: {openshift_openjdk_link}

3
openshift/master.adoc
View file

@ -9,7 +9,8 @@ include::topics/templates/document-attributes-product.adoc[]
:openshift_name: {openshift_openjdk_name}
:openshift_link: {openshift_openjdk_link}
:openshift_image_platforms: {openshift_openjdk_platforms}
:openshift_image: {openshift_openjdk_image}
:openshift_image_repository: {openshift_openjdk_image_repository}
:openshift_image_stream: {openshift_openjdk_image_stream}
:openshift_name_other: {openshift_openj9_name}
:openshift_link_other: {openshift_openj9_link}

2
openshift/topics/advanced_concepts.adoc
View file

@ -299,7 +299,7 @@ as an example. Update the example for other database drivers accordingly.
+
[source,subs="attributes+,macros+,+quotes"]
----
*FROM* {openshift_image}:latest
*FROM* {openshift_image_repository}:latest
*COPY* sso-extensions.cli /opt/eap/extensions/
*COPY* mariadb-java-client-2.5.4.jar /opt/eap/extensions/jdbc-driver.jar

16
openshift/topics/reference.adoc
View file

@ -82,25 +82,17 @@ information about the image and should not be modified by the user:
|*_true_*
|*_JBOSS_IMAGE_NAME_*
|Image name, same as Name label.
|*_redhat-sso-7/sso72-openshift_*
|*_JBOSS_IMAGE_RELEASE_*
|Image release, same as Release label.
|*_dev_*
|Image name, same as "name" label.
|*_{openshift_image_repository}_*
|*_JBOSS_IMAGE_VERSION_*
|Image version, same as Version label.
|*_1.1_*
|Image version, same as "version" label.
|*_{project_versionDoc}_*
|*_JBOSS_MODULES_SYSTEM_PKGS_*
|-
|*_org.jboss.logmanager,jdk.nashorn.api_*
|*_STI_BUILDER_*
|Provides OpenShift S2I support for jee project types.
|*_jee_*
|===
==== Configuration Environment Variables

4
tests/src/test/resources/ignored-links
View file

@ -30,7 +30,9 @@ http://127.0.0.1:3000/oauth/callback
https://api.linkedin.com/v2/me
https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso-cd-dev/templates/${resource}
https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso73-dev/templates/${resource}
https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso74-dev/templates/${resource}
https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso74-dev/templates/openj9/${resource}
https://issues.redhat.com/secure/CreateIssueDetails*
https://developer.paypal.com/developer/applications
https://account.live.com/developers/applications/create
https://developer.twitter.com/apps/
https://developer.twitter.com/apps/

9
topics/templates/document-attributes-product.adoc
View file

@ -11,7 +11,7 @@
:keycloak_upgrade_version: 9.0.x
:project_versionDoc: 7.4
:project_templates_base_url: https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso74-dev/templates
:project_latest_image_tag: 1.0
:project_latest_image_tag: {project_versionDoc}
:project_doc_base_url: https://access.redhat.com/documentation/en-us/red_hat_single_sign-on/{project_versionDoc}/html-single
:maven_repository: https://maven.repository.redhat.com/ga/
@ -63,15 +63,18 @@
:upgradingguide_link: {project_doc_base_url}/upgrading_guide/
:releasenotes_name: Release Notes
:releasenotes_link: {project_doc_base_url}/release_notes/
:openshift_image_repository_productline: rh-sso-7
:openshift_openjdk_name: Red Hat Single Sign-On for OpenShift on OpenJDK
:openshift_openjdk_link: {project_doc_base_url}/red_hat_single_sign-on_for_openshift/
:openshift_openjdk_platforms: x86_64
:openshift_openjdk_image: redhat-sso-7/sso74-openshift-rhel8
:openshift_openjdk_image_stream: sso74-openshift-rhel8
:openshift_openjdk_image_repository: {openshift_image_repository_productline}/{openshift_openjdk_image_stream}
:openshift_openjdk_project_templates_version: sso74
:openshift_openj9_name: Red Hat Single Sign-On for OpenShift on Eclipse OpenJ9
:openshift_openj9_link: {project_doc_base_url}/red_hat_single_sign-on_for_openshift_on_openj9/
:openshift_openj9_platforms: IBM Z/IBM Power Systems
:openshift_openj9_image: redhat-sso-7/sso74-openj9-openshift-rhel8
:openshift_openj9_image_stream: sso74-openj9-openshift-rhel8
:openshift_openj9_image_repository: {openshift_image_repository_productline}/{openshift_openj9_image_stream}
:openshift_openj9_project_templates_version: sso74-openj9
// Aggregate various frequently referred links to the official OCP documentation