Skip to content

Commit b484ddf

Browse files
fuzziebrainfuzziebrain
committed
#53 reverting to use Oracle's official dockerfiles for Oracle Database 21c XE.
1 parent c125ab2 commit b484ddf

File tree

4 files changed

+43
-54
lines changed

4 files changed

+43
-54
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@ oradata
9393
*-oradata
9494
*.env
9595
*.bak
96-
*.log
96+
*.log
97+
*.tar.gz

‎01-build.sh‎

Lines changed: 32 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -44,46 +44,38 @@ if [ -d 'dockerfiles' ]; then
4444
rm -rf dockerfiles;
4545
fi
4646

47-
if [ $DB_VERSION = '21.3.0' ] && [ $DB_EDITION = 'xe' ]; then
48-
echo "##### Grabbing custom Docker images from Oracle #####"
49-
git clone https://github.com/fuzziebrain/docker-oracledb21c-xe.git
50-
51-
mkdir dockerfiles
52-
mv docker-oracledb21c-xe dockerfiles/$DB_VERSION
47+
echo "##### Grabbing official Docker images from Oracle #####"
48+
git clone https://github.com/oracle/docker-images.git tmp
49+
50+
mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
51+
52+
rm -rf tmp/
53+
54+
echo "##### Staging RPM #####"
55+
if [ $DB_VERSION = '21.3.0' ] && [ ! $DB_EDITION = 'xe' ]; then
56+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
57+
DOCKER_FILE=Dockerfile
58+
elif [ $DB_VERSION = '19.3.0' ]; then
59+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_193000_db_home.zip
60+
DOCKER_FILE=Dockerfile
61+
elif [ $DB_VERSION = '18.4.0' ] && [ $DB_EDITION = 'xe' ]; then
62+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-18c-1.0-1.x86_64.rpm
63+
DOCKER_FILE=Dockerfile.$DB_EDITION
64+
elif [ $DB_VERSION = '18.3.0' ]; then
65+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_180000_db_home.zip
66+
DOCKER_FILE=Dockerfile
67+
elif [ $DB_VERSION = '12.2.0.1' ]; then
68+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxx64_12201_database.zip
69+
DOCKER_FILE=Dockerfile
70+
elif [ $DB_VERSION = '12.1.0.2' ]; then
71+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_1of2.zip
72+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_2of2.zip
73+
DOCKER_FILE=Dockerfile.$DB_EDITION
74+
elif [ $DB_VERSION = '11.2.0.2' ]; then
75+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
76+
DOCKER_FILE=Dockerfile.$DB_EDITION
5377
else
54-
echo "##### Grabbing official Docker images from Oracle #####"
55-
git clone https://github.com/oracle/docker-images.git tmp
56-
57-
mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
58-
59-
rm -rf tmp/
60-
61-
echo "##### Staging RPM #####"
62-
if [ $DB_VERSION = '21.3.0' ]; then
63-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
64-
DOCKER_FILE=Dockerfile
65-
elif [ $DB_VERSION = '19.3.0' ]; then
66-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_193000_db_home.zip
67-
DOCKER_FILE=Dockerfile
68-
elif [ $DB_VERSION = '18.4.0' ] && [ $DB_EDITION = 'xe' ]; then
69-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-18c-1.0-1.x86_64.rpm
70-
DOCKER_FILE=Dockerfile.$DB_EDITION
71-
elif [ $DB_VERSION = '18.3.0' ]; then
72-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_180000_db_home.zip
73-
DOCKER_FILE=Dockerfile
74-
elif [ $DB_VERSION = '12.2.0.1' ]; then
75-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxx64_12201_database.zip
76-
DOCKER_FILE=Dockerfile
77-
elif [ $DB_VERSION = '12.1.0.2' ]; then
78-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_1of2.zip
79-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_2of2.zip
80-
DOCKER_FILE=Dockerfile.$DB_EDITION
81-
elif [ $DB_VERSION = '11.2.0.2' ]; then
82-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
83-
DOCKER_FILE=Dockerfile.$DB_EDITION
84-
else
85-
echo "Unknown or unsupported database version and/or edition."
86-
fi
78+
echo "Unknown or unsupported database version and/or edition."
8779
fi
8880

8981
# TODO: test OML4R support for 21.3.0
@@ -118,11 +110,7 @@ if [[ $ALLOW_DB_PATCHING =~ (Y|y) ]]; then
118110
fi
119111

120112
echo "##### Building Docker Image for Oracle Database ${DB_VERSION} ${DB_EDITION} #####"
121-
if [ $DB_VERSION = '21.3.0' ] && [ $DB_EDITION = 'xe' ]; then
122-
cd dockerfiles/${DB_VERSION} && docker build -t oracle/database:${DB_VERSION}-${DB_EDITION} .
123-
else
124-
cd dockerfiles && . buildContainerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}
125-
fi
113+
cd dockerfiles && . buildContainerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}
126114

127115
cd $BASE_DIR
128116
echo "##### Done #####"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
1. Download the installer files:
2020
* The required Oracle Database installation files from [OTN](https://www.oracle.com/technetwork/database/) (supports versions up to 21.3.0 including Express Edition, as of September 22, 2021). **Note:** For [Oracle Database 21c XE](https://oracle.com/xe), you are no longer required to download the binaries (see issue #39).
2121
* [Oracle Application Express](https://apex.oracle.com/download) (supports versions up 21.2 as of November 04, 2021)
22-
* [Oracle REST Data Services](https://www.oracle.com/technetwork/developer-tools/rest-data-services/downloads/index.html) (supports versions up to 21.3.1.r3012050 as of November 04, 2021)
22+
* [Oracle REST Data Services](https://www.oracle.com/technetwork/developer-tools/rest-data-services/downloads/index.html) (supports versions up to 21.4.1 as of February 12, 2022)
2323
1. For releases after [0.6.0](https://github.com/fuzziebrain/docker-apex-stack/releases/tag/0.6.0), either choose to use the binaries from [OpenJDK](https://openjdk.java.net/), download a licensed Java runtime, or the [free to use](https://blogs.oracle.com/java/post/free-java-license) Java 17 from Oracle. Please refer to the additonal notes section [below](#Additional-Notes-About-the-Settings-File) for details about the `INSTALL_FILE_JAVA` parameter.
2424
1. Place all installer files in the sub-directory `files`.
2525
1. Create a file that contains the required environment variables for your build. Please refer to the additonal notes [below](#Additional-Notes-About-the-Settings-File) for more information about the various parameters that can be set. Included in this repository are two examples or templates that you can use:

‎settings.env.sample‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Description
22
# ===========
3-
# * Oracle Database 18c Express Edition
3+
# * Oracle Database 21c Express Edition
44
# * Database features:
55
# * Patching allowed? No
66
# * OML4R supported? No
@@ -12,15 +12,15 @@
1212

1313
ORACLE_SID=XE
1414
ORACLE_PDB=XEPDB1
15-
ORACLE_PWD=Oracle18
15+
ORACLE_PWD=Oracle21
1616
APEX_ADMIN_EMAIL=myemail@domain.com
17-
APEX_ADMIN_PWD=Oracle__18
18-
APEX_PUBLIC_USER_PWD=Oracle18_1
19-
APEX_LISTENER_PWD=Oracle18_2
20-
APEX_REST_PUBLIC_USER_PWD=Oracle18_3
21-
ORDS_PUBLIC_USER_PWD=Oracle18_4
17+
APEX_ADMIN_PWD=Oracle__21
18+
APEX_PUBLIC_USER_PWD=Oracle21_1
19+
APEX_LISTENER_PWD=Oracle21_2
20+
APEX_REST_PUBLIC_USER_PWD=Oracle21_3
21+
ORDS_PUBLIC_USER_PWD=Oracle21_4
2222
INSTALL_FILE_APEX=apex_21.2.zip
23-
INSTALL_FILE_ORDS=ords-21.3.1.301.2050.zip
23+
INSTALL_FILE_ORDS=ords-21.4.1.025.0904.zip
2424
INSTALL_FILE_JAVA=openjdk11
2525
DOCKER_ORDS_PORT=50080
2626
DOCKER_EM_PORT=55500

0 commit comments

Comments
 (0)