Skip to content

Commit fe35e8e

Browse files
author
Osni Oliveira
committed
Change the image to be based on UBI8
This is in preparation to have a multi-arch build for both Intel (x86_64) and IBM Z (s390x). However not mandatory (we could base on RHEL7), it was put as a desirable requirement - and might easy the process in some points. Changes/fixes include: - Change the base image - Change the package manager to dnf - Remove install of yum-utils - Remove modules not available in UBI8 (including database drivers for postgresql and mysql - also remove corresponding datasource definitions) - Change Maven installation method (from using Software Collections to using common packages) References: IBMZP-28, JDG-3368 WARNING: the image might be in a non-buildable state after this commit, required changes might be present in future commits.
1 parent 559c8a7 commit fe35e8e

File tree

10 files changed

+2
-41
lines changed

10 files changed

+2
-41
lines changed

image.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: jboss-datagrid-7/datagrid73-openshift
33
version: 1.4
44
description: "Red Hat JBoss Data Grid 7.3 for OpenShift container image"
55

6-
from: rhel7:7-released
6+
from: rh-osbs/ubi8:8.1-released
77

88
labels:
99
- name: "com.redhat.component"
@@ -204,14 +204,7 @@ modules:
204204
packages:
205205
content_sets_file: content_sets.yml
206206
install:
207-
- rh-mongodb32-mongo-java-driver
208-
- postgresql-jdbc
209-
- mysql-connector-java
210207
- hostname
211-
- python-requests
212-
- python-enum34
213-
- coreutils
214-
- PyYAML
215208
- openssl
216209
artifacts:
217210
- name: jboss-datagrid-server.zip

modules/common/jboss/container/maven/35/bash/artifacts/opt/jboss/container/maven/35/scl-enable-maven

Lines changed: 0 additions & 1 deletion
This file was deleted.

modules/common/jboss/container/maven/35/bash/configure.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

modules/common/jboss/container/maven/35/bash/module.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ envs:
1313
- name: MAVEN_VERSION
1414
value: "3.5"
1515

16-
execute:
17-
- script: configure.sh
18-
1916
packages:
2017
install:
21-
- rh-maven35
18+
- maven

modules/common/jboss/container/maven/default/bash/backward_compatibility.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ set -e
44

55
# For backward compatibility
66
mkdir -p /usr/local/s2i
7-
ln -s /opt/jboss/container/maven/default/scl-enable-maven /usr/local/s2i/scl-enable-maven
8-
chown -h jboss:root /usr/local/s2i/scl-enable-maven
97
ln -s /opt/jboss/container/maven/default/maven.sh /usr/local/s2i/common.sh
108
chown -h jboss:root /usr/local/s2i/common.sh

modules/common/jboss/container/maven/s2i/bash/artifacts/opt/jboss/container/maven/s2i/maven-s2i

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ function maven_s2i_init() {
3737
_MAVEN_S2I_ARCHIVED_REPO="${S2I_ARTIFACTS_DIR}/m2"
3838

3939
# include maven scripts
40-
source "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}"/scl-enable-maven
4140
source "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}"/maven.sh
4241

4342
# Overrides for use with maven s2i

modules/common/jboss/container/user/module.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ envs:
99

1010
packages:
1111
install:
12-
- yum-utils
1312
- unzip
1413
- tar
1514
- rsync

modules/common/os-eap-db-drivers/module.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ execute:
99

1010
packages:
1111
install:
12-
- rh-mongodb32-mongo-java-driver
1312
- postgresql-jdbc
14-
- mysql-connector-java

modules/common/os-eap-s2i/added/s2i/assemble

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
66
fi
77

88
source "$JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE"/maven.sh
9-
source "$JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE"/scl-enable-maven
109

1110
LOCAL_SOURCE_DIR=/tmp/src
1211

modules/datagrid/configuration/added/clustered-openshift.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,6 @@
144144
<driver name="h2" module="com.h2database.h2">
145145
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
146146
</driver>
147-
<driver name="mysql" module="com.mysql">
148-
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
149-
</driver>
150-
<driver name="postgresql" module="org.postgresql">
151-
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
152-
</driver>
153147
<!-- ##DRIVERS## -->
154148
</drivers>
155149
</datasources>

0 commit comments

Comments
 (0)