Remove Spatial & Upload images (#26)

* Build full image Signed-off-by: gvenzl <[email protected]> * Introduce password reset (ER #2) Signed-off-by: gvenzl <[email protected]> * Introduce healthcheck (ER #1) Signed-off-by: gvenzl <[email protected]> * Shutdown listener before database Signed-off-by: gvenzl <[email protected]> * Fix healthcheck typo Signed-off-by: gvenzl <[email protected]> * Update description header Signed-off-by: gvenzl <[email protected]> * Use build args for Dockerfile Signed-off-by: gvenzl <[email protected]> * Update Description Signed-off-by: gvenzl <[email protected]> * Add password profile, restructure db file sizes Signed-off-by: gvenzl <[email protected]> * Transition to OL8 slim Signed-off-by: gvenzl <[email protected]> * Introducing a image build script Signed-off-by: gvenzl <[email protected]> * Full completed, normal and slim TBD Signed-off-by: gvenzl <[email protected]> * Update ReadMe Signed-off-by: gvenzl <[email protected]> * Add test scripts Signed-off-by: gvenzl <[email protected]> * Add .gitignore Signed-off-by: gvenzl <[email protected]> * Print DATABASE IS READY TO USE only after healthcheck succeeded (ER #6) Signed-off-by: gvenzl <[email protected]> * 18c Dockerfile Signed-off-by: gvenzl <[email protected]> * Full install DB configured Signed-off-by: gvenzl <[email protected]> * Add checksum verification for 18c Signed-off-by: gvenzl <[email protected]> * Add parameter to ignore checksum Signed-off-by: gvenzl <[email protected]> * 18c full install Signed-off-by: gvenzl <[email protected]> * Remove recovery_dest Signed-off-by: gvenzl <[email protected]> * Remove install log files Signed-off-by: gvenzl <[email protected]> * Remove installation phase only dependencies Signed-off-by: gvenzl <[email protected]> * Update ORACLE_HOME in .bash_profile Signed-off-by: gvenzl <[email protected]> * Resize redo logs Signed-off-by: gvenzl <[email protected]> * Include network files Signed-off-by: gvenzl <[email protected]> * ER #8: Set password only at initialization Signed-off-by: gvenzl <[email protected]> * Use entrypoint rather cmd Signed-off-by: gvenzl <[email protected]> * Add build duration to build script Signed-off-by: gvenzl <[email protected]> * Compress data files in image Signed-off-by: gvenzl <[email protected]> * Implemented ORACLE_RANDOM_PASSWORD ER #9 Signed-off-by: gvenzl <[email protected]> * Update .gitignore Signed-off-by: gvenzl <[email protected]> * rename entrypoint script Signed-off-by: gvenzl <[email protected]> * Implement ER #4 - _FILE variable support Signed-off-by: gvenzl <[email protected]> * Make zip and gzip a runtime requirement Signed-off-by: gvenzl <[email protected]> * Make sure PWD is treated as a string Signed-off-by: gvenzl <[email protected]> * Add support for custom scripts ER #3 Signed-off-by: gvenzl <[email protected]> * Update ReadMe (WIP) Signed-off-by: gvenzl <[email protected]> * reformat indent Signed-off-by: gvenzl <[email protected]> * Reorg Signed-off-by: gvenzl <[email protected]> * Build and container tests for 11g and 18c Signed-off-by: gvenzl <[email protected]> * Update UNDO size Signed-off-by: gvenzl <[email protected]> * Update ReadMe Signed-off-by: gvenzl <[email protected]> * Introduce tags Signed-off-by: gvenzl <[email protected]> * Add slim builds for 11g Signed-off-by: gvenzl <[email protected]> * Remove comment line Signed-off-by: gvenzl <[email protected]> * Update ReadMe Signed-off-by: gvenzl <[email protected]> * fix typo in ReadMe Signed-off-by: gvenzl <[email protected]> * Remove MKL requirement Signed-off-by: gvenzl <[email protected]> * Remove sysconfig file Signed-off-by: gvenzl <[email protected]> * Clean up DB components Signed-off-by: gvenzl <[email protected]> * Update tests and retries Signed-off-by: gvenzl <[email protected]> * Update all references to REGULAR images Signed-off-by: gvenzl <[email protected]> * Clean zip files in lib dir Signed-off-by: gvenzl <[email protected]> * Remove not needed deps from fortran runtime Signed-off-by: gvenzl <[email protected]> * Remove inventory directory Signed-off-by: gvenzl <[email protected]> * Move zip file to ORACLE_BASE for host-only vols Signed-off-by: gvenzl <[email protected]> * Use SHRINK SPACE for TEMP files Signed-off-by: gvenzl <[email protected]> * Exit SQL*Plus on SQL errors Signed-off-by: gvenzl <[email protected]> * Add tag and upload scripts Signed-off-by: gvenzl <[email protected]> * Remove XDB Signed-off-by: gvenzl <[email protected]> * Remove Oracle Text Signed-off-by: gvenzl <[email protected]> * Remove Spatial Signed-off-by: gvenzl <[email protected]> * Escape $ signs Signed-off-by: gvenzl <[email protected]> * Fix rm ctx typo Signed-off-by: gvenzl <[email protected]> * Create new TEMP tablespace for SEED Signed-off-by: gvenzl <[email protected]> * Shrink UNDO tablespaces Signed-off-by: gvenzl <[email protected]> * Intro Artifactory uploads Signed-off-by: gvenzl <[email protected]> * Add fully qualified tags Signed-off-by: gvenzl <[email protected]> * Update ReadMe Signed-off-by: gvenzl <[email protected]> * Undo retention no longer required Signed-off-by: gvenzl <[email protected]> * Further reduce 11g slim image Signed-off-by: gvenzl <[email protected]> * No longer needed due to new UNDO tablespace creation Signed-off-by: gvenzl <[email protected]> * Remove OJVM and Java Packages + Multimedia and XDK dependencies Signed-off-by: gvenzl <[email protected]> * Update ReadMe Signed-off-by: gvenzl <[email protected]> * Introduce tests for ORACLE_PASSWORD and ORACLE_RANDOM_PASSWORD Signed-off-by: gvenzl <[email protected]> * ER #16: provide APP user variables Signed-off-by: gvenzl <[email protected]> * Add Ora pwd, random pwd and app user/pwd tests Signed-off-by: gvenzl <[email protected]> * Remove workspace manager Signed-off-by: gvenzl <[email protected]> * Remove OLAP Signed-off-by: gvenzl <[email protected]> * Update package dependencies removal Signed-off-by: gvenzl <[email protected]> * Make removal messages consistent Signed-off-by: gvenzl <[email protected]> * Fix Java Packages removal Signed-off-by: gvenzl <[email protected]> * ER #22: provide GitHub Actions snippet Signed-off-by: gvenzl <[email protected]> * Remove Java Package leftovers Signed-off-by: gvenzl <[email protected]> * Do not remove SLAX, used for PL/SQL Signed-off-by: gvenzl <[email protected]> * Remove Oracle Text, produce SLIM image Signed-off-by: gvenzl <[email protected]> * Update dep removal Signed-off-by: gvenzl <[email protected]> * Add 18c slim tests Signed-off-by: gvenzl <[email protected]> * Do not remove LDAP folder Signed-off-by: gvenzl <[email protected]> * Update test descriptions Signed-off-by: gvenzl <[email protected]> * SQLPlus: fail on error Signed-off-by: gvenzl <[email protected]> * Remove OJVMSYS leftover Signed-off-by: gvenzl <[email protected]> * ER #23: Support ORACLE_DATABASE Signed-off-by: gvenzl <[email protected]> * Add checkpoint after UNDO switch Signed-off-by: gvenzl <[email protected]> * Remove GPX, standalone, can be downloaded Signed-off-by: gvenzl <[email protected]> * Update container test run script Signed-off-by: gvenzl <[email protected]> * Update ReadMe for OARCLE_DATABASE 18c only Signed-off-by: gvenzl <[email protected]> * Update ReadMe with SLIM image Signed-off-by: gvenzl <[email protected]> * Add slim images to upload scripts Signed-off-by: gvenzl <[email protected]> * Remove Spatial Signed-off-by: gvenzl <[email protected]>
gvenzl · Jul 12, 2021 · da38b8b · da38b8b
1 parent 131c900
commit da38b8b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -325,6 +325,7 @@ The slim images aims for smallest possible image size with only the Oracle Datab
 #### Database components
 
 * `Oracle Text` has been uninstalled and removed (`$ORACLE_HOME/ctx`)
+* `Oracle Spatial` has been uninstalled and removed (`$ORACLE_HOME/md`)
 * The demo samples directory has been removed (`$ORACLE_HOME/demo`)
 * `ODBC` driver samples have been removed (`$ORACLE_HOME/odbc`)
 * `TNS` demo samples have been removed (`$ORACLE_HOME/network/admin/samples`)

diff --git a/install.1840.sh b/install.1840.sh
@@ -527,14 +527,21 @@ EOF
   if [ "${BUILD_MODE}" == "SLIM" ]; then
 
     # Needs to be run as 'oracle' user (Perl script otherwise fails #TODO: see whether it can be run with su -c somehow instead)
+
     echo "BUILDER: Removing additional components for SLIM image"
     su - oracle << EOF
       cd "${ORACLE_HOME}"/rdbms/admin
 
       # Remove Oracle Text
+      echo "BUILDER: Removing Oracle Text"
       "${ORACLE_HOME}"/perl/bin/perl catcon.pl -n 1 -b builder_remove_text_pdbs -C 'CDB\$ROOT' -d "${ORACLE_HOME}"/ctx/admin catnoctx.sql
       "${ORACLE_HOME}"/perl/bin/perl catcon.pl -n 1 -b builder_remove_text_cdb -c 'CDB\$ROOT' -d "${ORACLE_HOME}"/ctx/admin catnoctx.sql
 
+      # Remove Spatial
+      echo "BUILDER: Removing Oracle Spatial"
+      "${ORACLE_HOME}"/perl/bin/perl catcon.pl -n 1 -C 'CDB\$ROOT' -b builder_remove_spatial_pdbs -d "${ORACLE_HOME}"/md/admin mddins.sql
+      "${ORACLE_HOME}"/perl/bin/perl catcon.pl -n 1 -c 'CDB\$ROOT' -b builder_remove_spatial_cdb  -d "${ORACLE_HOME}"/md/admin mddins.sql
+
       # Recompile
       echo "BUILDER: Recompiling database objects"
       "${ORACLE_HOME}"/perl/bin/perl catcon.pl -n 1 -b builder_recompile_all_objects -d "${ORACLE_HOME}"/rdbms/admin utlrp.sql
@@ -558,6 +565,10 @@ EOF
        exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP PACKAGE XDB.DBMS_XDBT');
        exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP PROCEDURE SYS.VALIDATE_CONTEXT');
 
+       -- Remove Spatial leftover components
+       exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP USER MDDATA CASCADE');
+       exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP USER MDSYS CASCADE');
+
        -- Open PDB\$SEED to READ WRITE mode (catcon put it into READY ONLY again)
        ALTER PLUGGABLE DATABASE PDB\$SEED CLOSE;
        ALTER PLUGGABLE DATABASE PDB\$SEED OPEN READ WRITE;
@@ -570,6 +581,9 @@ EOF
        exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP PACKAGE XDB.DBMS_XDBT');
        exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP PROCEDURE SYS.VALIDATE_CONTEXT');
 
+       -- Remove Spatial leftover components
+       exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP USER MDDATA CASCADE');
+
        ALTER SESSION SET CONTAINER=XEPDB1;
 
        -- Oracle Text leftovers
@@ -578,6 +592,9 @@ EOF
        exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP PACKAGE XDB.DBMS_XDBT');
        exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP PROCEDURE SYS.VALIDATE_CONTEXT');
 
+       -- Remove Spatial leftover components
+       exec DBMS_PDB.EXEC_AS_ORACLE_SCRIPT('DROP USER MDDATA CASCADE');
+
        exit;
 EOF
 
@@ -586,7 +603,6 @@ EOF
   #####################
   # Shrink data files #
   #####################
-
   su -p oracle -c "sqlplus -s / as sysdba" << EOF
 
      -- Exit on any errors
@@ -973,6 +989,9 @@ if [ "${BUILD_MODE}" == "REGULAR" ] || [ "${BUILD_MODE}" == "SLIM" ]; then
     # Remove rdbms/jlib directory
     rm -r "${ORACLE_HOME}"/rdbms/xml
 
+    # Remove Spatial
+    rm -r "${ORACLE_HOME}"/md
+
     # TODO
 
   fi;

diff --git a/tests/upload_images.sh b/tests/upload_images.sh
@@ -46,6 +46,13 @@ podman push gvenzl/oracle-xe:18.4.0          docker.io/gvenzl/oracle-xe:18.4.0
 echo "Upload 18"
 podman push gvenzl/oracle-xe:18              docker.io/gvenzl/oracle-xe:18
 
+echo "Upload 18.4.0-slim"
+podman push gvenzl/oracle-xe:18.4.0-slim     docker.io/gvenzl/oracle-xe:18.4.0-slim
+echo "Upload 18-slim"
+podman push gvenzl/oracle-xe:18-slim         docker.io/gvenzl/oracle-xe:18-slim
+echo "Upload slim"
+podman push gvenzl/oracle-xe:slim            docker.io/gvenzl/oracle-xe:slim
+
 # Upload 11g images
 echo "Upload 11.2.0.2-full"
 podman push gvenzl/oracle-xe:11.2.0.2-full   docker.io/gvenzl/oracle-xe:11.2.0.2-full

diff --git a/tests/upload_images_artifactory.sh b/tests/upload_images_artifactory.sh
@@ -43,6 +43,13 @@ podman push gvenzl/oracle-xe:18.4.0          gvenzl.jfrog.io/docker/oracle-xe:18
 echo "Upload 18"
 podman push gvenzl/oracle-xe:18              gvenzl.jfrog.io/docker/oracle-xe:18
 
+echo "Upload 18.4.0-slim"
+podman push gvenzl/oracle-xe:18.4.0-slim     gvenzl.jfrog.io/docker/oracle-xe:18.4.0-slim
+echo "Upload 18-slim"
+podman push gvenzl/oracle-xe:18-slim         gvenzl.jfrog.io/docker/oracle-xe:18-slim
+echo "Upload slim"
+podman push gvenzl/oracle-xe:slim            gvenzl.jfrog.io/docker/oracle-xe:slim
+
 # Upload 11g images
 echo "Upload 11.2.0.2-full"
 podman push gvenzl/oracle-xe:11.2.0.2-full   gvenzl.jfrog.io/docker/oracle-xe:11.2.0.2-full