Skip to content

Commit 6cfffb4

Browse files
fuzziebrainfuzziebrain
authored
Merge pull request #54 from fuzziebrain/feature/issue-39-1
Refresh from main branch.
2 parents 17b0c72 + 7217203 commit 6cfffb4

File tree

6 files changed

+54
-62
lines changed

6 files changed

+54
-62
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: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -45,56 +45,51 @@ if [ -d 'dockerfiles' ]; then
4545
rm -rf dockerfiles;
4646
fi
4747

48-
if [ $DB_VERSION = '21.3.0' ] && [ $DB_EDITION = 'xe' ]; then
49-
echo "##### Grabbing custom Docker images from Oracle #####"
50-
git clone https://github.com/fuzziebrain/docker-oracledb21c-xe.git
48+
echo "##### Grabbing official Docker images from Oracle #####"
49+
git clone https://github.com/oracle/docker-images.git tmp
5150

52-
mkdir dockerfiles
53-
mv docker-oracledb21c-xe dockerfiles/$DB_VERSION
51+
mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
5452

55-
if [[ $XE_NO_DOWNLOAD =~ (Y|y) ]]; then
56-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-21c-1.0-1.ol7.x86_64.rpm
57-
sed $SED_OPTS "s|${XE_DOWNLOAD_BASE_URL}||g" ${DOCKER_FILE:-Dockerfile}
58-
sed $SED_OPTS "s|^(COPY)(.+CHECK_SPACE_FILE.+INSTALL_DIR/)$|\1 \$INSTALL_FILE_1\2|g" ${DOCKER_FILE:-Dockerfile}
59-
fi
60-
else
61-
echo "##### Grabbing official Docker images from Oracle #####"
62-
git clone https://github.com/oracle/docker-images.git tmp
63-
64-
mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
53+
rm -rf tmp/
6554

66-
rm -rf tmp/
67-
68-
echo "##### Staging RPM #####"
69-
if [ $DB_VERSION = '21.3.0' ]; then
70-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
71-
DOCKER_FILE=Dockerfile
72-
elif [ $DB_VERSION = '19.3.0' ]; then
73-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_193000_db_home.zip
74-
DOCKER_FILE=Dockerfile
75-
elif [ $DB_VERSION = '18.4.0' ] && [ $DB_EDITION = 'xe' ]; then
55+
echo "##### Staging RPM #####"
56+
if [ $DB_VERSION = '21.3.0' ]; then
57+
if [ $DB_EDITION = 'xe' ]; then
7658
DOCKER_FILE=Dockerfile.$DB_EDITION
7759
if [[ $XE_NO_DOWNLOAD =~ (Y|y) ]]; then
78-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-18c-1.0-1.x86_64.rpm
60+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-21c-1.0-1.ol7.x86_64.rpm
7961
sed $SED_OPTS "s|${XE_DOWNLOAD_BASE_URL}||g" ${DOCKER_FILE:-Dockerfile}
8062
sed $SED_OPTS "s|^(COPY)(.+CHECK_SPACE_FILE.+INSTALL_DIR/)$|\1 \$INSTALL_FILE_1\2|g" ${DOCKER_FILE:-Dockerfile}
81-
fi
82-
elif [ $DB_VERSION = '18.3.0' ]; then
83-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_180000_db_home.zip
84-
DOCKER_FILE=Dockerfile
85-
elif [ $DB_VERSION = '12.2.0.1' ]; then
86-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxx64_12201_database.zip
87-
DOCKER_FILE=Dockerfile
88-
elif [ $DB_VERSION = '12.1.0.2' ]; then
89-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_1of2.zip
90-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_2of2.zip
91-
DOCKER_FILE=Dockerfile.$DB_EDITION
92-
elif [ $DB_VERSION = '11.2.0.2' ]; then
93-
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
94-
DOCKER_FILE=Dockerfile.$DB_EDITION
63+
fi
9564
else
96-
echo "Unknown or unsupported database version and/or edition."
65+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
66+
DOCKER_FILE=Dockerfile
9767
fi
68+
elif [ $DB_VERSION = '19.3.0' ]; then
69+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_193000_db_home.zip
70+
DOCKER_FILE=Dockerfile
71+
elif [ $DB_VERSION = '18.4.0' ] && [ $DB_EDITION = 'xe' ]; then
72+
DOCKER_FILE=Dockerfile.$DB_EDITION
73+
if [[ $XE_NO_DOWNLOAD =~ (Y|y) ]]; then
74+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-18c-1.0-1.x86_64.rpm
75+
sed $SED_OPTS "s|${XE_DOWNLOAD_BASE_URL}||g" ${DOCKER_FILE:-Dockerfile}
76+
sed $SED_OPTS "s|^(COPY)(.+CHECK_SPACE_FILE.+INSTALL_DIR/)$|\1 \$INSTALL_FILE_1\2|g" ${DOCKER_FILE:-Dockerfile}
77+
fi
78+
elif [ $DB_VERSION = '18.3.0' ]; then
79+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_180000_db_home.zip
80+
DOCKER_FILE=Dockerfile
81+
elif [ $DB_VERSION = '12.2.0.1' ]; then
82+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxx64_12201_database.zip
83+
DOCKER_FILE=Dockerfile
84+
elif [ $DB_VERSION = '12.1.0.2' ]; then
85+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_1of2.zip
86+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_2of2.zip
87+
DOCKER_FILE=Dockerfile.$DB_EDITION
88+
elif [ $DB_VERSION = '11.2.0.2' ]; then
89+
cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
90+
DOCKER_FILE=Dockerfile.$DB_EDITION
91+
else
92+
echo "Unknown or unsupported database version and/or edition."
9893
fi
9994

10095
# TODO: test OML4R support for 21.3.0
@@ -129,11 +124,7 @@ if [[ $ALLOW_DB_PATCHING =~ (Y|y) ]]; then
129124
fi
130125

131126
echo "##### Building Docker Image for Oracle Database ${DB_VERSION} ${DB_EDITION} #####"
132-
if [ $DB_VERSION = '21.3.0' ] && [ $DB_EDITION = 'xe' ]; then
133-
cd dockerfiles/${DB_VERSION} && docker build --no-cache -t oracle/database:${DB_VERSION}-${DB_EDITION} .
134-
else
135-
cd dockerfiles && . buildContainerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}
136-
fi
127+
cd dockerfiles && . buildContainerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}
137128

138129
cd $BASE_DIR
139130
echo "##### Done #####"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
1. Git clone this repository and set it as the working directory.
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).
21-
* [Oracle Application Express](https://apex.oracle.com/download) (supports versions up 21.1 as of May 12, 2021)
22-
* [Oracle REST Data Services](https://www.oracle.com/technetwork/developer-tools/rest-data-services/downloads/index.html) (supports versions up to 21.2.0.174.1826 as of July 10, 2021)
21+
* [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.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: 9 additions & 9 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
22-
INSTALL_FILE_APEX=apex_21.1.zip
23-
INSTALL_FILE_ORDS=ords-21.2.0.174.1826.zip
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
22+
INSTALL_FILE_APEX=apex_21.2.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

‎settings_db19c.env.sample‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ APEX_PUBLIC_USER_PWD=Oracle19_1
1919
APEX_LISTENER_PWD=Oracle19_2
2020
APEX_REST_PUBLIC_USER_PWD=Oracle19_3
2121
ORDS_PUBLIC_USER_PWD=Oracle19_4
22-
INSTALL_FILE_APEX=apex_21.1.zip
23-
INSTALL_FILE_ORDS=ords-21.2.0.174.1826.zip
22+
INSTALL_FILE_APEX=apex_21.2.zip
23+
INSTALL_FILE_ORDS=ords-21.3.1.301.2050.zip
2424
INSTALL_FILE_JAVA=server-jre-8u301-linux-x64.tar.gz
2525
DOCKER_ORDS_PORT=50080
2626
DOCKER_EM_PORT=55500

‎settings_db21c.env.sample‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ APEX_PUBLIC_USER_PWD=Oracle21_1
1919
APEX_LISTENER_PWD=Oracle21_2
2020
APEX_REST_PUBLIC_USER_PWD=Oracle21_3
2121
ORDS_PUBLIC_USER_PWD=Oracle21_4
22-
INSTALL_FILE_APEX=apex_21.1.zip
23-
INSTALL_FILE_ORDS=ords-21.2.0.174.1826.zip
22+
INSTALL_FILE_APEX=apex_21.2.zip
23+
INSTALL_FILE_ORDS=ords-21.3.1.301.2050.zip
2424
INSTALL_FILE_JAVA=server-jre-8u301-linux-x64.tar.gz
2525
DOCKER_ORDS_PORT=50080
2626
DOCKER_EM_PORT=55500

0 commit comments

Comments
 (0)