diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b5ec4e7dba..55efa2ac9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,6 +92,30 @@ the image owner to implement it. 1. All images must provide a `CMD` or `ENTRYPOINT`. If your image is designed to be extended, then this should output documentation on how to extend the image to be useful. +1. Use `LABEL` instructions for additional information such as ports and volumes. The following are common label instructions that should be present in all images where applicable: + +| Label | Value | Applicability | +| -------- | ----- | ------------- | +| provider | `Oracle` | All images | +| issues | `https://github.com/oracle/docker-images/issues` | All images | +| maintainer | Name of the maintainer | At the discretion of the author. | +| volume(.`purpose`) | Use `volume` labels to describe the volumes of an image.
If your image has multiple volumes, use qualified names to specify the purpose of each volume, for example `volume.data` for data to be persisted outside the container.
Use hierarchical nesting for multiple volumes of the same type, for example:
| Mandatory for all images that require persistent storage beyond the life of an individual container. | +| port(.`purpose`) | Use `port` labels to describe the ports of an image.
If your images has multiple ports, use qualified names to specify the purpose of each port, for example `port.app` for the port on which your application is reachable.
Use hierarchical nesting for multiple ports of the same type, for example:
| Mandatory for all images that require externally accessible port mappings. | + +For example, for the Oracle Database 18c XE image we use the following labels: + +``` +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/opt/oracle/oradata" \ + "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/opt/oracle/scripts/startup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" \ + "port.apex"="8080" +``` ### Security-related Rules @@ -103,10 +127,6 @@ image to be useful. on container startup using `openssl rand` or accept a password argument during container startup (via `-e`). - - - - ### Guidelines and Recommendations The following are some guidelines that will not prevent an image from being @@ -130,4 +150,4 @@ any defaults that are used if no input is provided. gracefully fail if that value is not provided. -*Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.* +*Copyright (c) 2017, 2020 Oracle and/or its affiliates.* diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index b7748a7fef..4e157640ea 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 1982-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016, 2020 Oracle and/or its affiliates. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -28,9 +28,17 @@ # --------------- FROM oraclelinux:7-slim -# Maintainer -# ---------- -MAINTAINER Gerald Venzl +# Labels +# ------ +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/u01/app/oracle/oradata" \ + "volume.setup.location1"="/u01/app/oracle/scripts/startup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/u01/app/oracle/scripts/setup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.apex"="8080" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -78,8 +86,6 @@ RUN yum -y install unzip libaio bc initscripts net-tools openssl compat-libstdc+ rm -rf $INSTALL_DIR && \ chmod ug+x $ORACLE_BASE/*.sh -VOLUME ["$ORACLE_BASE/oradata"] -EXPOSE 1521 8080 HEALTHCHECK --interval=1m --start-period=5m \ CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1 diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee index 47ef6c0308..82e80ec245 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 1982-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2020 Oracle and/or its affiliates. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -23,9 +23,17 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer -# ---------- -MAINTAINER Gerald Venzl +# Labels +# ------ +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/opt/oracle/oradata" \ + "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/opt/oracle/scripts/startup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -107,8 +115,6 @@ RUN $ORACLE_BASE/oraInventory/orainstRoot.sh && \ USER oracle WORKDIR /home/oracle -VOLUME ["$ORACLE_BASE/oradata"] -EXPOSE 1521 5500 HEALTHCHECK --interval=1m --start-period=5m \ CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1 diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 index 7d10d0609f..28e8c126f7 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 1982-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2020 Oracle and/or its affiliates. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -23,9 +23,17 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer -# ---------- -MAINTAINER Gerald Venzl +# Labels +# ------ +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/opt/oracle/oradata" \ + "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/opt/oracle/scripts/startup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -107,8 +115,6 @@ RUN $ORACLE_BASE/oraInventory/orainstRoot.sh && \ USER oracle WORKDIR /home/oracle -VOLUME ["$ORACLE_BASE/oradata"] -EXPOSE 1521 5500 HEALTHCHECK --interval=1m --start-period=5m \ CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1 diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile index d4ff682861..71df07b58f 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 1982-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2020 Oracle and/or its affiliates. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -22,9 +22,17 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer -# ---------- -MAINTAINER Gerald Venzl +# Labels +# ------ +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/opt/oracle/oradata" \ + "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/opt/oracle/scripts/startup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -104,8 +112,6 @@ RUN $ORACLE_BASE/oraInventory/orainstRoot.sh && \ USER oracle WORKDIR /home/oracle -VOLUME ["$ORACLE_BASE/oradata"] -EXPOSE 1521 5500 HEALTHCHECK --interval=1m --start-period=5m \ CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1 diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile index 724f8eaf1f..608cb49f12 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 1982-2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 2020 Oracle and/or its affiliates. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -22,9 +22,17 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer -# ---------- -MAINTAINER Gerald Venzl +# Labels +# ------ +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/opt/oracle/oradata" \ + "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/opt/oracle/scripts/startup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -104,8 +112,6 @@ RUN $ORACLE_BASE/oraInventory/orainstRoot.sh && \ USER oracle WORKDIR /home/oracle -VOLUME ["$ORACLE_BASE/oradata"] -EXPOSE 1521 5500 HEALTHCHECK --interval=1m --start-period=5m \ CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1 diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe index e6e714e37a..a186cbeadc 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 1982-2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 2020 Oracle and/or its affiliates. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -21,9 +21,18 @@ # --------------- FROM oraclelinux:7-slim -# Maintainer -# ---------- -MAINTAINER Gerald Venzl +# Labels +# ------ +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/opt/oracle/oradata" \ + "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/opt/oracle/scripts/startup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" \ + "port.apex"="8080" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -68,8 +77,6 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \ rm -rf $INSTALL_DIR && \ chmod ug+x $ORACLE_BASE/*.sh -VOLUME ["$ORACLE_BASE/oradata"] -EXPOSE 1521 8080 5500 HEALTHCHECK --interval=1m --start-period=5m \ CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1 diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile index 4c99096092..97f95c6ae4 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 1982-2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 2020 Oracle and/or its affiliates. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -22,9 +22,17 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer -# ---------- -MAINTAINER Gerald Venzl +# Labels +# ------ +LABEL "provider"="Oracle" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "volume.data"="/opt/oracle/oradata" \ + "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ + "volume.startup.location1"="/opt/oracle/scripts/startup" \ + "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -101,8 +109,6 @@ RUN $ORACLE_BASE/oraInventory/orainstRoot.sh && \ USER oracle WORKDIR /home/oracle -VOLUME ["$ORACLE_BASE/oradata"] -EXPOSE 1521 5500 HEALTHCHECK --interval=1m --start-period=5m \ CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1 diff --git a/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.ee index 39ddb193b6..a746a8c86e 100644 --- a/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.ee @@ -20,10 +20,6 @@ # --------------- FROM oracle/database:12.1.0.2-ee -# Maintainer -# ---------- -MAINTAINER Gerald Venzl - # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV PATCH_DIR="patches" \ diff --git a/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.se2 index bffc8cbfc0..65544242d3 100644 --- a/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.se2 @@ -20,10 +20,6 @@ # --------------- FROM oracle/database:12.1.0.2-se2 -# Maintainer -# ---------- -MAINTAINER Gerald Venzl - # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV PATCH_DIR="patches" \ diff --git a/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.ee b/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.ee index cf91593a48..2f070b1511 100644 --- a/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.ee @@ -20,10 +20,6 @@ # --------------- FROM oracle/database:12.2.0.1-ee -# Maintainer -# ---------- -MAINTAINER Gerald Venzl - # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV PATCH_DIR="patches" \ diff --git a/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.se2 b/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.se2 index 669fb8cbc2..6e15359ff8 100644 --- a/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.se2 @@ -20,10 +20,6 @@ # --------------- FROM oracle/database:12.2.0.1-se2 -# Maintainer -# ---------- -MAINTAINER Gerald Venzl - # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV PATCH_DIR="patches" \ diff --git a/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md b/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md index 9da28ab322..d9e28f6429 100644 --- a/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md +++ b/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md @@ -1,56 +1,33 @@ # Example of creating an image with pre-built DB -***Warning: The description below requires changes in the dockerfile related to the version and edition in question (docker-images/OracleDatabase/SingleInstance/dockerfiles/$VERSION/Dockerfile). It's recommended that you revert the changes after you have completed creating image without VOLUME (see next section).*** -## 1. Create an image without a VOLUME +## 1. Startup a container and create the database -When creating an image with a pre-build DB, we first need an image without a VOLUME. To create such an image you'll need to comment out the VOLUME command in the dockerfile in use (docker-images/OracleDatabase/SingleInstance/dockerfiles/$VERSION/Dockerfile). +First, you need to start up a container to get a database created. For this you will have to have the image already built. -Comment out the following line: ``` -#VOLUME ["$ORACLE_BASE/oradata"] +docker run --name oracle-build -p 1521:1521 -p 5500:5500 oracle/database:19.3.0-ee ``` -In the example below I have edited the Dockerfile for version 12.2.0.1 and Enterprise Edition (ee) (docker-images/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile). -If you want to keep your existing image, you need to rename it: -``` -docker tag oracle/database:12.2.0.1-ee oracle/database-org:12.2.0.1-ee -``` - -Then create an image without a VOLUME: -``` -cd docker-images/OracleDatabase/SingleInstance/dockerfiles -sh buildDockerImage.sh -v 12.2.0.1 -e -``` +## 2. Reset passwords (optional) -## 2. Startup a container and create the database +It's recommended to reset the passwords before creating the new prebuilt image. This way you don't have to reset it every time you create a new container. -We first need to start up a container to get the database created. -**Note:** First make sure you have built **oracle/database:12.2.0.1-ee**. -Now start the container as follow: -``` -docker run --name oracle-build -p 1521:1521 -p 5500:5500 oracle/database:12.2.0.1-ee -``` - -## 3. Reset passwords (optional) - -It's recommended to reset passwords before creating the image. This way you don't have to do it everytime you create a new container. - -Now you should connect to the container and reset passwords: +Connect to the container and reset passwords: ``` docker exec oracle-build ./setPassword.sh ``` -## 4. Stop the running container +## 3. Stop the running container Stop the container (and therefore also the database) before generating your new prebuilt image: ``` -docker stop -t 30 oracle-build +docker stop -t 600 oracle-build ``` -## 5. Create the image with the prebuilt database +## 4. Create the image with the prebuilt database -Open a new console on your host and run the following command: +Create the new image via `docker commit`: ``` -docker commit -m "Image with prebuilt database" oracle-build oracle/db-prebuilt:12.2.0.1-ee +docker commit -m "Image with prebuilt database" oracle-build oracle/db-prebuilt:19.3.0-ee ``` ## 5. Clean up @@ -59,41 +36,34 @@ Remove the temporary container: ``` docker rm oracle-build ``` -Remove the image without VOLUME and rename the old image (if exists): -``` -docker rmi oracle/database:12.2.0.1-ee -docker tag oracle/database-org:12.2.0.1-ee oracle/database:12.2.0.1-ee -``` -Uncomment the volume instruction in your Dockerfile: -``` -VOLUME ["$ORACLE_BASE/oradata"] -``` ## 6. Ready to use your image with prebuild database Run your prebuild image: ``` -docker run --name -p 1521:1521 -p 5500:5500 oracle/db-prebuilt:12.2.0.1-ee +docker run --name -p 1521:1521 -p 5500:5500 oracle/db-prebuilt:19.3.0-ee ``` After the container is up and running you can connect to the new database. You can also run your new image from a docker compose. -Create a directory, example "ora12c-db01", and add the following docker-compose.yml file: +Create a directory, for example `ora19c-db01`, and add the following docker-compose.yml file: + ``` version: '2' services: orcl-node: - image: oracle/db-prebuilt:12.2.0.1-ee + image: oracle/db-prebuilt:19.3.0-ee ports: - "1521:1521" - "5500:5500" ``` + And run: + ``` docker-compose up ``` -# Copyright -Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +*Copyright (c) 2014, 2020 Oracle and/or its affiliates.* diff --git a/OracleDatabase/SingleInstance/tests/runContainerTests193.sh b/OracleDatabase/SingleInstance/tests/runContainerTests193.sh new file mode 100755 index 0000000000..47fd7aca3c --- /dev/null +++ b/OracleDatabase/SingleInstance/tests/runContainerTests193.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# LICENSE UPL 1.0 +# +# Copyright (c) 2020 Oracle and/or its affiliates. +# +# Since: March, 2020 +# Author: gerald.venzl@oracle.com +# Description: Runs all 19c related tests for Oracle Database Docker containers +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# + +source ./helperFunctions.sh + +###################### TEST 19.3.0 EE default ########################### + +runContainerTest "19.3.0 EE default database" "19.3.0-EE-default" "oracle/database:19.3.0-ee" + +###################### TEST 19.3.0 SE2 default ########################### + +runContainerTest "19.3.0 SE2 default database" "19.3.0-SE2-default" "oracle/database:19.3.0-se2" + +###################### TEST 19.3.0 EE lowercase PDB name ########################### + +runContainerTest "19.3.0 EE lowercase PDB name" "19.3.0-EE-lowercase-pdb" "oracle/database:19.3.0-ee" "ORCLTEST" "mypdb" + +###################### TEST 19.3.0 EE WE8ISO8859P1 character set ########################### + +runContainerTest "19.3.0 EE WE8ISO8859P1 character set" "19.3.0-EE-WE8ISO8859P1-character-set" "oracle/database:19.3.0-ee" "ORCLTEST" "PDB1" "WE8ISO8859P1" + +###################### TEST 19.3.0 EE WE8MSWIN1252 character set ########################### + +runContainerTest "19.3.0 EE WE8MSWIN1252 character set" "19.3.0-EE-WE8MSWIN1252-character-set" "oracle/database:19.3.0-ee" "ORCLTEST" "PDB1" "WE8MSWIN1252" + +###################### TEST 19.3.0 EE JA16SJISTILDE character set ########################### + +runContainerTest "19.3.0 EE JA16SJISTILDE character set" "19.3.0-EE-JA16SJISTILDE-character-set" "oracle/database:19.3.0-ee" "ORCLTEST" "PDB1" "JA16SJISTILDE" + +###################### TEST 19.3.0 EE KO16KSC5601 character set ########################### + +runContainerTest "19.3.0 EE KO16KSC5601 character set" "19.3.0-EE-KO16KSC5601-character-set" "oracle/database:19.3.0-ee" "ORCLTEST" "PDB1" "KO16KSC5601" + +###################### TEST 19.3.0 EE lowercase ORACLE_SID ########################### + +runContainerTest "19.3.0 EE lowercase ORACLE_SID" "19.3.0-EE-lowercase_ORACLE_SID" "oracle/database:19.3.0-ee" "orcltest" "PDB1" + +###################### TEST 19.3.0 EE lowercase ORACLE_PDB ########################### + +runContainerTest "19.3.0 EE lowercase ORACLE_PDB" "19.3.0-EE-lowercase_ORACLE_PDB" "oracle/database:19.3.0-ee" "ORCLTEST" "pdb1" diff --git a/OracleDatabase/SingleInstance/tests/runImageBuildTests.sh b/OracleDatabase/SingleInstance/tests/runImageBuildTests.sh index 7904cbe881..1008e5d300 100755 --- a/OracleDatabase/SingleInstance/tests/runImageBuildTests.sh +++ b/OracleDatabase/SingleInstance/tests/runImageBuildTests.sh @@ -1,7 +1,7 @@ #!/bin/bash # LICENSE UPL 1.0 # -# Copyright (c) 1982-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2020 Oracle and/or its affiliates. # # Since: July, 2017 # Author: gerald.venzl@oracle.com @@ -35,6 +35,29 @@ function checkError { cd "../dockerfiles" +###################### TESTS 19.3.0 images ########################### + +# Copy binary file +cp $BIN_DIR/LINUX.X64_193000_db_home.zip ./19.3.0/ + +###################### TEST 19.3.0 EE ########################### + +# Build 19.3.0 EE images +./buildDockerImage.sh -e -v 19.3.0 +checkError "Build 19.3.0 EE image" $? + +###################### TEST 19.3.0 SE2 ########################### + +# Build 19.3.0 SE2 images +./buildDockerImage.sh -s -v 19.3.0 +checkError "Build 19.3.0 SE2 image" $? + +# Delete binary file +rm ./19.3.0/LINUX.X64_193000_db_home.zip + +###################### END TESTS 19.3.0 images ########################### + + ###################### TESTS 18.3.0 images ########################### # Copy binary file