Skip to content

Commit b60f765

Browse files
adhramesadhrames
authored
Merge branch 'oracle:main' into Added_Support_SOA_14.1.2.0
2 parents f6e28e8 + a7520e4 commit b60f765

File tree

95 files changed

+1212
-1799
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1212
-1799
lines changed

‎.github/workflows/build-and-push-dev-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ on:
2828
required: false
2929
lang:
3030
description: List of languages to build
31-
default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'
31+
default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools, httpd'
3232
required: false
3333

3434
# Default values for the builds triggered by the push event
3535
env:
3636
ol: 'oraclelinux7, oraclelinux8, oraclelinux9'
37-
lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'
37+
lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools, httpd'
3838

3939
jobs:
4040
prepare:

‎OracleAnalytics/README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Sample container configurations facilitate
44
installation, configuration, and environment setup for DevOps users.
55
This project includes quick start
6-
[container](dockerfiles/) for Oracle Analytics Server 2022 (6.4)
7-
based on Oracle Linux 7, Oracle JRE 8 (Server),
6+
[container](dockerfiles/) for Oracle Analytics Server 2025 (8.2)
7+
based on Oracle Linux 8, Oracle JRE 8 (Server),
88
and Oracle Fusion Middleware Infrastructure 12.2.1.4.0.
99

1010
For more information about Oracle Analytics Server,
@@ -32,7 +32,7 @@ you must use PDB when creating the schemas because CDB isn’t supported.
3232
You can create an Oracle Database container by using an
3333
[OracleDatabase](https://github.com/oracle/docker-images/tree/master/OracleDatabase)
3434
image.
35-
Follow these instructions to create a 12.1 or 12.2 Enterprise Edition database.
35+
Follow these instructions to create a 12.1+ / 12.2+ / 19+ / 21c / 23ai Enterprise Edition database.
3636

3737
## Oracle Analytics Server Container Image Creation
3838

@@ -41,8 +41,8 @@ Before you can build a BI image, you will need to build the [Oracle Java](https:
4141
### Building the Oracle Analytics Server Image
4242

4343
Download the binaries for
44-
[Oracle Analytics Server 2022 (6.4)](https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html)
45-
for Linux x86-64-bit into the folder `OracleAnalytics/dockerfiles/6.4`.
44+
[Oracle Analytics Server 2025 (8.2)](https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html)
45+
for Linux x86-64-bit into the folder `OracleAnalytics/dockerfiles/2025`.
4646

4747
If you need a proxy for the host to access yum.oracle.com during build,
4848
first set up the appropriate environment. For example:
@@ -57,22 +57,22 @@ Build the image:
5757

5858
```bash
5959
cd OracleAnalytics/dockerfiles
60-
./buildContainerImage.sh -v 6.4
60+
./buildContainerImage.sh -v 2025
6161
```
6262

6363
Sample command(s) for users who don't want to use the above script to build the image:
6464

6565
```bash
6666
# without proxy
67-
docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:6.4 -f Dockerfile .
67+
docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:2025 -f Dockerfile .
6868

6969
# with proxy
70-
docker build --force-rm=true --no-cache=true --build-arg http_proxy=http://myproxy.example.com:80 --build-arg https_proxy=https://myproxy.example.com:80 -t oracle/analyticsserver:6.4 -f Dockerfile .
70+
docker build --force-rm=true --no-cache=true --build-arg http_proxy=http://myproxy.example.com:80 --build-arg https_proxy=https://myproxy.example.com:80 -t oracle/analyticsserver:2025 -f Dockerfile .
7171
```
7272

7373
### Building the Oracle Analytics Server Patched Image
7474

75-
See the [Oracle Analytics patched image documentation](./patches/6.4-patch) for details.
75+
See the [Oracle Analytics patched image documentation](./patches/2025-patch) for details.
7676

7777
## Creating an Oracle Analytics Server Container
7878

@@ -108,7 +108,7 @@ The following variables are predefined:
108108
For example:
109109

110110
```bash
111-
docker run -d --name bi -p 9500:9500 -p 9502:9502 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> oracle/analyticsserver:6.4-patch
111+
docker run -d --name bi -p 9500:9500 -p 9502:9502 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> oracle/analyticsserver:2025-patch
112112
```
113113

114114
Change _<...password>_ to your required values, and DB values to match your database.
@@ -138,7 +138,7 @@ you must modify the previous `docker run` command to expose port 9514.
138138
For example:
139139

140140
```bash
141-
docker run -it -p 9500:9500 -p 9502:9502 -p 9514:9514 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> oracle/analyticsserver:6.4-patch
141+
docker run -it -p 9500:9500 -p 9502:9502 -p 9514:9514 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> -e BI_APP_LITE_PASSWORD=<bi_app_lite_password> oracle/analyticsserver:2025-patch
142142
```
143143

144144
### Using a Host Directory for Persistent Data
@@ -177,7 +177,7 @@ For example,
177177

178178
3. Start a BI container that uses the database by name:
179179

180-
$ docker run --name bi --network=bi_net -e DB_HOST=database ...... oracle/analyticsserver:6.4-patch
180+
$ docker run --name bi --network=bi_net -e DB_HOST=database ...... oracle/analyticsserver:2025-patch
181181

182182
Note: In the above container run examples, other parameters are omitted for clarity.
183183

@@ -247,4 +247,4 @@ released under the Universal Permissive License v 1.0 as shown at <https://oss.o
247247

248248
## Copyright
249249

250-
Copyright (c) 2022 Oracle and/or its affiliates.
250+
Copyright (c) 2025 Oracle and/or its affiliates.

‎OracleAnalytics/dockerfiles/2025/Checksum.md5‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright (c) 2025 Oracle and/or its affiliates.
2+
#
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
#
5+
# Download Oracle Analytics Server Installer 2025
6+
#
7+
# - https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html
8+
#
9+
f6f7558bdc8f430fdccca49e3cbcd105 Oracle_Analytics_Server_Linux_2025(8.2).zip

OracleAnalytics/dockerfiles/6.4/Dockerfile renamed to OracleAnalytics/dockerfiles/2025/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
# Copyright (c) 2022 Oracle and/or its affiliates.
1+
# Copyright (c) 2025 Oracle and/or its affiliates.
22
#
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
#
55
# ORACLE DOCKERFILES PROJECT
66
# --------------------------
7-
# This is the Dockerfile for Oracle Analytics Server 2022 (6.4)
7+
# This is the Dockerfile for Oracle Analytics Server 2025 (8.2)
88
#
99
# REQUIRED FILE(S) TO BUILD THIS IMAGE
1010
# ----------------------------------
11-
# (1) Oracle_Analytics_Server_Linux_2022(6.4).zip
11+
# (1) Oracle_Analytics_Server_Linux_2025(8.2).zip
1212
# Download the installer file from https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html
1313
#
1414
# HOW TO BUILD THIS IMAGE
1515
# -----------------------
1616
# Put all downloaded files in the same directory as this Dockerfile
1717
# Run:
18-
# $ docker build -t oracle/analyticsserver:6.4 .
18+
# $ docker build -t oracle/analyticsserver:2025 .
1919
#
2020
# Pull base image
2121
# ---------------
@@ -32,8 +32,8 @@ ENV ORACLE_HOME=/u01/oracle
3232
# Environment variables required for this build (do NOT change)
3333
# (DOMAIN_NAME/HOME are reset here, to avoid FMW Infra environment leaking through)
3434
# -------------------------------------------------------------
35-
ENV BI_DISTRO_ZIP1=Oracle_Analytics_Server_Linux_2022(6.4).zip \
36-
BI_INSTALLER1=Oracle_Analytics_Server_Linux_6.4.0.jar \
35+
ENV BI_DISTRO_ZIP1=Oracle_Analytics_Server_Linux_2025(8.2).zip \
36+
BI_INSTALLER1=Oracle_Analytics_Server_2025_Linux.jar \
3737
DOMAIN_NAME="${BI_DOMAIN_NAME:-bi}" \
3838
DOMAINS_DIR=$ORACLE_HOME/user_projects/domains \
3939
DOMAIN_HOME=$ORACLE_HOME/user_projects/domains/${BI_DOMAIN_NAME:-bi}
@@ -47,7 +47,7 @@ COPY $BI_DISTRO_ZIP1 install.file oraInst.loc /u01/
4747
USER root
4848

4949
# tools for installing and running BI
50-
RUN yum -y install unzip hostname && rm -rf /var/cache/yum
50+
RUN dnf -y install unzip hostname libnsl && dnf clean all
5151

5252
USER oracle
5353
RUN unzip "/u01/$BI_DISTRO_ZIP1" -d /u01 && \

OracleAnalytics/dockerfiles/6.4/createAndStartDomain.sh renamed to OracleAnalytics/dockerfiles/2025/createAndStartDomain.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -e
22
#
3-
# Copyright (c) 2022 Oracle and/or its affiliates.
3+
# Copyright (c) 2025 Oracle and/or its affiliates.
44
#
55
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
66
#
@@ -121,7 +121,7 @@ validateMandatoryParameter() {
121121
}
122122

123123
# TODO only ORACLE_HOME/DOMAIN_NAME/DOMAINS_DIR is mandatory once domain is configured
124-
mandatoryParameters=(ORACLE_HOME DOMAIN_NAME DOMAINS_DIR ADMIN_USERNAME ADMIN_PASSWORD DB_HOST DB_PORT DB_SERVICE DB_USERNAME DB_PASSWORD SCHEMA_PREFIX SCHEMA_PASSWORD)
124+
mandatoryParameters=(ORACLE_HOME DOMAIN_NAME DOMAINS_DIR ADMIN_USERNAME ADMIN_PASSWORD DB_HOST DB_PORT DB_SERVICE DB_USERNAME DB_PASSWORD SCHEMA_PREFIX SCHEMA_PASSWORD BI_APP_LITE_PASSWORD)
125125
missingMandatoryParameters=()
126126
for mandatoryParameter in "${mandatoryParameters[@]}"; do
127127
missingParam=$(validateMandatoryParameter "$mandatoryParameter")
@@ -190,6 +190,9 @@ if [ ! -f "$domainCheckFile" ]; then
190190
replacements+=" -e \"s|@@DEFAULT_SI_KEY@@|ssi|g\""
191191
replacements+=" -e \"s|@@PORT_RANGE_START@@|9500|g\""
192192
replacements+=" -e \"s|@@PORT_RANGE_END@@|9999|g\""
193+
replacements+=" -e \"s|@@ENABLE_SSL@@|false|g\""
194+
replacements+=" -e \"s|@@DB_ROLE@@|SYSDBA|g\""
195+
replacements+=" -e \"s|@@APP_PASSWORD@@|$BI_APP_LITE_PASSWORD|g\""
193196

194197
eval sed -i "$replacements" "$responseFile"
195198

OracleAnalytics/dockerfiles/6.4/install.file renamed to OracleAnalytics/dockerfiles/2025/install.file

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 Oracle and/or its affiliates.
1+
# Copyright (c) 2025 Oracle and/or its affiliates.
22
#
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
#

OracleAnalytics/dockerfiles/6.4/oraInst.loc renamed to OracleAnalytics/dockerfiles/2025/oraInst.loc

File renamed without changes.

OracleAnalytics/dockerfiles/6.4/wait_for_db.sh renamed to OracleAnalytics/dockerfiles/2025/wait_for_db.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright (c) 2022 Oracle and/or its affiliates.
3+
# Copyright (c) 2025 Oracle and/or its affiliates.
44
#
55
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
66

‎OracleAnalytics/dockerfiles/6.4/Checksum.md5‎

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

‎OracleAnalytics/patches/2025-patch/Dockerfile‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# Copyright (c) 2025 Oracle and/or its affiliates.
2+
#
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
#
5+
# ORACLE DOCKERFILES PROJECT
6+
# --------------------------
7+
# This Dockerfile extends the Oracle Analytics Server 2025 (8.2), and applies necessary
8+
# patches required.
9+
10+
# REQUIRED FILES TO BUILD THIS IMAGE
11+
# ----------------------------------
12+
# (1) p37804819_122140_Generic.zip
13+
# (2) p34809489_122140_Generic.zip
14+
# (3) p36649916_122140_Generic.zip
15+
# (4) p37284722_122140_Generic.zip
16+
# (5) p37684007_122140_Generic.zip
17+
# (6) p36316422_122140_Generic.zip
18+
# (7) p36946553_122140_Generic.zip
19+
# (8) p37388935_122140_Generic.zip
20+
# (9) p37526122_122140_Linux-x86-64.zip
21+
# (10) p37665839_122140_Linux-x86-64.zip
22+
23+
# Download the patches from https://support.oracle.com
24+
#
25+
# HOW TO BUILD THIS IMAGE
26+
# -----------------------
27+
# Put all downloaded files in the same directory as this Dockerfile
28+
# Run:
29+
# $ docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:2025-patch .
30+
#
31+
32+
# Pull base image
33+
# ---------------
34+
FROM oracle/analyticsserver:2025
35+
36+
# Labels
37+
# ------
38+
LABEL "maintainer"="Padam Bengani <[email protected]>"
39+
40+
# Install
41+
#-------------------------------------------------------------
42+
USER root
43+
44+
# tools for applying patches
45+
RUN dnf install -y binutils make gcc glibc-devel && dnf clean all
46+
47+
# Common ENV
48+
#-----------
49+
ENV OPATCH_NO_FUSER=true
50+
51+
# Environment variables required for this build (do NOT change)
52+
# -------------------------------------------------------------
53+
ENV PATCH_PKG_37804819="p37804819_122140_Generic.zip" \
54+
PATCH_PKG_34809489="p34809489_122140_Generic.zip" \
55+
PATCH_PKG_36649916="p36649916_122140_Generic.zip" \
56+
PATCH_PKG_37284722="p37284722_122140_Generic.zip" \
57+
PATCH_PKG_37684007="p37684007_122140_Generic.zip" \
58+
PATCH_PKG_36316422="p36316422_122140_Generic.zip" \
59+
PATCH_PKG_36946553="p36946553_122140_Generic.zip" \
60+
PATCH_PKG_37388935="p37388935_122140_Generic.zip" \
61+
PATCH_PKG_37526122="p37526122_122140_Linux-x86-64.zip" \
62+
PATCH_PKG_37665839="p37665839_122140_Linux-x86-64.zip"
63+
64+
# Copy supplemental package and scripts
65+
# --------------------------------
66+
COPY --chown=oracle:oracle \
67+
$PATCH_PKG_37804819 $PATCH_PKG_34809489 $PATCH_PKG_36649916 $PATCH_PKG_37284722 \
68+
$PATCH_PKG_37526122 $PATCH_PKG_37684007 $PATCH_PKG_36316422 $PATCH_PKG_36946553 \
69+
$PATCH_PKG_37388935 $PATCH_PKG_37665839 /u01/
70+
71+
# Installation of Supplemental Quick Installer and Patches
72+
# --------------------------------------------------------
73+
USER oracle
74+
75+
RUN unzip "/u01/$PATCH_PKG_37804819" -d /u01 && \
76+
chmod +x /u01/WLS_SPB_12.2.1.4.250408/tools/spbat/generic/SPBAT/spbat.sh && \
77+
/u01/WLS_SPB_12.2.1.4.250408/tools/spbat/generic/SPBAT/spbat.sh -phase apply -oracle_home "$ORACLE_HOME" && \
78+
rm "/u01/$PATCH_PKG_37804819" && \
79+
unzip "/u01/$PATCH_PKG_34809489" -d /u01 && \
80+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/34809489 && \
81+
rm "/u01/$PATCH_PKG_34809489" && \
82+
unzip "/u01/$PATCH_PKG_36649916" -d /u01 && \
83+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36649916 && \
84+
rm "/u01/$PATCH_PKG_36649916" && \
85+
unzip "/u01/$PATCH_PKG_37284722" -d /u01 && \
86+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37284722 && \
87+
rm "/u01/$PATCH_PKG_37284722" && \
88+
unzip "/u01/$PATCH_PKG_37684007" -d /u01 && \
89+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37684007 && \
90+
rm "/u01/$PATCH_PKG_37684007" && \
91+
unzip "/u01/$PATCH_PKG_36316422" -d /u01 && \
92+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36316422 && \
93+
rm "/u01/$PATCH_PKG_36316422" && \
94+
unzip "/u01/$PATCH_PKG_36946553" -d /u01 && \
95+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36946553 && \
96+
rm "/u01/$PATCH_PKG_36946553" && \
97+
unzip "/u01/$PATCH_PKG_37388935" -d /u01 && \
98+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37388935 && \
99+
rm "/u01/$PATCH_PKG_37388935" && \
100+
unzip "/u01/$PATCH_PKG_37526122" -d /u01 && \
101+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37526122 && \
102+
rm "/u01/$PATCH_PKG_37526122" && \
103+
unzip "/u01/$PATCH_PKG_37665839" -d /u01 && \
104+
"$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36749613 && \
105+
rm "/u01/$PATCH_PKG_37665839"
106+
107+
WORKDIR ${ORACLE_HOME}
108+
109+
CMD ["/u01/createAndStartDomain.sh"]

0 commit comments

Comments
 (0)