From 295002a30ed7fd78efcb7d493d7abcd1a20d25f2 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Wed, 25 Mar 2020 14:05:28 -0700 Subject: [PATCH 01/17] Remove VOLUME, EXPOSE, MAINTAINER, add labels Signed-off-by: Gerald Venzl --- .../SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe | 9 +++++---- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee | 9 +++++---- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 | 9 +++++---- .../SingleInstance/dockerfiles/12.2.0.1/Dockerfile | 9 +++++---- .../SingleInstance/dockerfiles/18.3.0/Dockerfile | 9 +++++---- .../SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 10 ++++++---- .../SingleInstance/dockerfiles/19.3.0/Dockerfile | 9 +++++---- 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index b7748a7fef..d8084be7c3 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -28,9 +28,12 @@ # --------------- FROM oraclelinux:7-slim -# Maintainer +# Labels # ---------- -MAINTAINER Gerald Venzl +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/opt/oracle/oradata" \ + "port.listener"="1521" \ + "port.apex"="8080" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -78,8 +81,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..0cd725b0a3 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee @@ -23,9 +23,12 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer +# Labels # ---------- -MAINTAINER Gerald Venzl +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/opt/oracle/oradata" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -107,8 +110,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..119593d23f 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 @@ -23,9 +23,12 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer +# Labels # ---------- -MAINTAINER Gerald Venzl +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/opt/oracle/oradata" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -107,8 +110,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..b88e1f637c 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile @@ -22,9 +22,12 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer +# Labels # ---------- -MAINTAINER Gerald Venzl +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/opt/oracle/oradata" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -104,8 +107,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..271dfe8e16 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile @@ -22,9 +22,12 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer +# Labels # ---------- -MAINTAINER Gerald Venzl +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/opt/oracle/oradata" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -104,8 +107,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..51e10eed9f 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe @@ -21,9 +21,13 @@ # --------------- FROM oraclelinux:7-slim -# Maintainer +# Labels # ---------- -MAINTAINER Gerald Venzl +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/opt/oracle/oradata" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" \ + "port.apex"="8080" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -68,8 +72,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..b984c0e539 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile @@ -22,9 +22,12 @@ # --------------- FROM oraclelinux:7-slim as base -# Maintainer +# Labels # ---------- -MAINTAINER Gerald Venzl +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/opt/oracle/oradata" \ + "port.listener"="1521" \ + "port.oemexpress"="5500" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- @@ -101,8 +104,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 From 7c62ebbd73ef04ecb55dc50847d40cd0bdd19cbd Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Wed, 25 Mar 2020 14:18:26 -0700 Subject: [PATCH 02/17] Add setup and startup volumes Signed-off-by: Gerald Venzl --- .../dockerfiles/11.2.0.2/Dockerfile.xe | 10 +++++++--- .../dockerfiles/12.1.0.2/Dockerfile.ee | 10 +++++++--- .../dockerfiles/12.1.0.2/Dockerfile.se2 | 10 +++++++--- .../SingleInstance/dockerfiles/12.2.0.1/Dockerfile | 10 +++++++--- .../SingleInstance/dockerfiles/18.3.0/Dockerfile | 10 +++++++--- .../SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 12 ++++++++---- .../SingleInstance/dockerfiles/19.3.0/Dockerfile | 10 +++++++--- 7 files changed, 50 insertions(+), 22 deletions(-) diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index d8084be7c3..071308adc7 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -30,9 +30,13 @@ FROM oraclelinux:7-slim # Labels # ---------- -LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ - "port.listener"="1521" \ +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/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.apex"="8080" # Environment variables required for this build (do NOT change) diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee index 0cd725b0a3..6b710e3e6f 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee @@ -25,9 +25,13 @@ FROM oraclelinux:7-slim as base # Labels # ---------- -LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ - "port.listener"="1521" \ +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/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) diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 index 119593d23f..1bdf658039 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 @@ -25,9 +25,13 @@ FROM oraclelinux:7-slim as base # Labels # ---------- -LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ - "port.listener"="1521" \ +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/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) diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile index b88e1f637c..a668181311 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile @@ -24,9 +24,13 @@ FROM oraclelinux:7-slim as base # Labels # ---------- -LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ - "port.listener"="1521" \ +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/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) diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile index 271dfe8e16..4df02be641 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile @@ -24,9 +24,13 @@ FROM oraclelinux:7-slim as base # Labels # ---------- -LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ - "port.listener"="1521" \ +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/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) diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe index 51e10eed9f..660f26cbe4 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe @@ -23,10 +23,14 @@ FROM oraclelinux:7-slim # Labels # ---------- -LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ - "port.listener"="1521" \ - "port.oemexpress"="5500" \ +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/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) diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile index b984c0e539..1cf544994e 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile @@ -24,9 +24,13 @@ FROM oraclelinux:7-slim as base # Labels # ---------- -LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ - "port.listener"="1521" \ +LABEL "maintainer"="Gerald Venzl " \ + "volume.oradata"="/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) From 2f075dc7e0346a52edaa1e2f4b5f7fa2e94c4c60 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Wed, 25 Mar 2020 14:38:06 -0700 Subject: [PATCH 03/17] change volume.oradata to volume.data (more generic) Signed-off-by: Gerald Venzl --- .../SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe | 2 +- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee | 2 +- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 | 2 +- OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile | 2 +- OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile | 2 +- OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 +- OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index 071308adc7..016fc9faeb 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -31,7 +31,7 @@ FROM oraclelinux:7-slim # Labels # ---------- LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee index 6b710e3e6f..3bfdc088a4 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee @@ -26,7 +26,7 @@ FROM oraclelinux:7-slim as base # Labels # ---------- LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 index 1bdf658039..e3122bced7 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 @@ -26,7 +26,7 @@ FROM oraclelinux:7-slim as base # Labels # ---------- LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile index a668181311..6298b31357 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile @@ -25,7 +25,7 @@ FROM oraclelinux:7-slim as base # Labels # ---------- LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile index 4df02be641..8e6d7e8e50 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile @@ -25,7 +25,7 @@ FROM oraclelinux:7-slim as base # Labels # ---------- LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe index 660f26cbe4..ff4b07c4a1 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe @@ -24,7 +24,7 @@ FROM oraclelinux:7-slim # Labels # ---------- LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile index 1cf544994e..9431091bed 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile @@ -25,7 +25,7 @@ FROM oraclelinux:7-slim as base # Labels # ---------- LABEL "maintainer"="Gerald Venzl " \ - "volume.oradata"="/opt/oracle/oradata" \ + "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" \ From 4842c4cb7f79356a057c42f21a4633a40b82e7b5 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Wed, 25 Mar 2020 14:43:58 -0700 Subject: [PATCH 04/17] Add 19c tests Signed-off-by: Gerald Venzl --- .../tests/runContainerTests193.sh | 49 +++++++++++++++++++ .../tests/runImageBuildTests.sh | 25 +++++++++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100755 OracleDatabase/SingleInstance/tests/runContainerTests193.sh diff --git a/OracleDatabase/SingleInstance/tests/runContainerTests193.sh b/OracleDatabase/SingleInstance/tests/runContainerTests193.sh new file mode 100755 index 0000000000..8211d8253c --- /dev/null +++ b/OracleDatabase/SingleInstance/tests/runContainerTests193.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# LICENSE UPL 1.0 +# +# Copyright (c) 1982-2020 Oracle and/or its affiliates. All rights reserved. +# +# 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..0064737762 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) 1982-2020 Oracle and/or its affiliates. All rights reserved. # # 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 From 054a0749c428fe43074659b59b17c126e232b951 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Wed, 25 Mar 2020 15:43:22 -0700 Subject: [PATCH 05/17] Add provider and issues, change maintainer (no email) Signed-off-by: Gerald Venzl --- .../SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe | 6 ++++-- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee | 6 ++++-- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 | 6 ++++-- .../SingleInstance/dockerfiles/12.2.0.1/Dockerfile | 6 ++++-- OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile | 6 ++++-- .../SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 6 ++++-- OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index 016fc9faeb..468e12bd9c 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -29,8 +29,10 @@ FROM oraclelinux:7-slim # Labels -# ---------- -LABEL "maintainer"="Gerald Venzl " \ +# ------ +LABEL "provider"="Oracle Corporation" \ + "maintainer"="Gerald Venzl" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee index 3bfdc088a4..c949c32541 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee @@ -24,8 +24,10 @@ FROM oraclelinux:7-slim as base # Labels -# ---------- -LABEL "maintainer"="Gerald Venzl " \ +# ------ +LABEL "provider"="Oracle Corporation" \ + "maintainer"="Gerald Venzl" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 index e3122bced7..946da116ec 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 @@ -24,8 +24,10 @@ FROM oraclelinux:7-slim as base # Labels -# ---------- -LABEL "maintainer"="Gerald Venzl " \ +# ------ +LABEL "provider"="Oracle Corporation" \ + "maintainer"="Gerald Venzl" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile index 6298b31357..3effa6dbb3 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile @@ -23,8 +23,10 @@ FROM oraclelinux:7-slim as base # Labels -# ---------- -LABEL "maintainer"="Gerald Venzl " \ +# ------ +LABEL "provider"="Oracle Corporation" \ + "maintainer"="Gerald Venzl" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile index 8e6d7e8e50..384b65eddd 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile @@ -23,8 +23,10 @@ FROM oraclelinux:7-slim as base # Labels -# ---------- -LABEL "maintainer"="Gerald Venzl " \ +# ------ +LABEL "provider"="Oracle Corporation" \ + "maintainer"="Gerald Venzl" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe index ff4b07c4a1..ecffc633dc 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe @@ -22,8 +22,10 @@ FROM oraclelinux:7-slim # Labels -# ---------- -LABEL "maintainer"="Gerald Venzl " \ +# ------ +LABEL "provider"="Oracle Corporation" \ + "maintainer"="Gerald Venzl" \ + "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" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile index 9431091bed..f5295233cf 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile @@ -23,8 +23,10 @@ FROM oraclelinux:7-slim as base # Labels -# ---------- -LABEL "maintainer"="Gerald Venzl " \ +# ------ +LABEL "provider"="Oracle Corporation" \ + "maintainer"="Gerald Venzl" \ + "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" \ From aef3fd89f65c00fba4e79d09d018adbb3d9d9946 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Wed, 25 Mar 2020 18:40:51 -0700 Subject: [PATCH 06/17] Change order of labels for Contributing Signed-off-by: Gerald Venzl --- .../SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe | 2 +- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee | 2 +- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 | 2 +- OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile | 2 +- OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile | 2 +- OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 +- OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index 468e12bd9c..39cd894ee4 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -31,8 +31,8 @@ FROM oraclelinux:7-slim # Labels # ------ LABEL "provider"="Oracle Corporation" \ - "maintainer"="Gerald Venzl" \ "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee index c949c32541..1675db88a4 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee @@ -26,8 +26,8 @@ FROM oraclelinux:7-slim as base # Labels # ------ LABEL "provider"="Oracle Corporation" \ - "maintainer"="Gerald Venzl" \ "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 index 946da116ec..69f2c6d5cc 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 @@ -26,8 +26,8 @@ FROM oraclelinux:7-slim as base # Labels # ------ LABEL "provider"="Oracle Corporation" \ - "maintainer"="Gerald Venzl" \ "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile index 3effa6dbb3..08aa2b262c 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile @@ -25,8 +25,8 @@ FROM oraclelinux:7-slim as base # Labels # ------ LABEL "provider"="Oracle Corporation" \ - "maintainer"="Gerald Venzl" \ "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile index 384b65eddd..4583dc19ad 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile @@ -25,8 +25,8 @@ FROM oraclelinux:7-slim as base # Labels # ------ LABEL "provider"="Oracle Corporation" \ - "maintainer"="Gerald Venzl" \ "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe index ecffc633dc..67efacc7b8 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe @@ -24,8 +24,8 @@ FROM oraclelinux:7-slim # Labels # ------ LABEL "provider"="Oracle Corporation" \ - "maintainer"="Gerald Venzl" \ "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile index f5295233cf..1dfc8b4065 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile @@ -25,8 +25,8 @@ FROM oraclelinux:7-slim as base # Labels # ------ LABEL "provider"="Oracle Corporation" \ - "maintainer"="Gerald Venzl" \ "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ From d4c625443ce9495338df3d121c7ef177b611998a Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Thu, 26 Mar 2020 09:45:04 -0700 Subject: [PATCH 07/17] Update 11g XE volume paths Signed-off-by: Gerald Venzl --- .../SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index 39cd894ee4..57adf333d3 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -33,10 +33,10 @@ FROM oraclelinux:7-slim LABEL "provider"="Oracle Corporation" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ - "volume.data"="/opt/oracle/oradata" \ - "volume.setup.location1"="/opt/oracle/scripts/setup" \ + "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"="/opt/oracle/scripts/startup" \ + "volume.startup.location1"="/u01/app/oracle/scripts/setup" \ "volume.startup.location2"="/docker-entrypoint-initdb.d/startup" \ "port.listener"="1521" \ "port.apex"="8080" From 886fa13987ff1c7528895c89b2879260f0276362 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Thu, 26 Mar 2020 14:28:40 -0700 Subject: [PATCH 08/17] Update prebuild example Signed-off-by: Gerald Venzl --- .../samples/prebuiltdb/README.md | 65 +++++-------------- 1 file changed, 18 insertions(+), 47 deletions(-) diff --git a/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md b/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md index 9da28ab322..35adff1688 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,35 @@ 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. All rights reserved. From 554ab95071da634c2abed1c0325cf7db0c5048f1 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Thu, 26 Mar 2020 14:30:47 -0700 Subject: [PATCH 09/17] Update contributing to reflect labels Signed-off-by: Gerald Venzl --- CONTRIBUTING.md | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b5ec4e7dba..76c5552dc6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,17 +81,42 @@ a pull request. 1. Extend an existing product image wherever possible. For example, if your product requires WebLogic, then extend the WebLogic image instead of creating your own WebLogic installation. -1. If you can't extend an existing image, your image must use the +2. If you can't extend an existing image, your image must use the `oraclelinux:7-slim` base image as this image provides the smallest attack surface and is updated whenever a CVE errata is published. -1. Re-use existing scripts wherever possible. If a particular base image or +3. Re-use existing scripts wherever possible. If a particular base image or script doesn't have the functionality you need, open an issue and work with the image owner to implement it. -1. Specify a version in the `FROM` directive, i.e. use +4. Specify a version in the `FROM` directive, i.e. use `FROM oraclelinux:7-slim` or `FROM java/serverjre:8`. -1. All images must provide a `CMD` or `ENTRYPOINT`. If your image is designed +5. 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. +6. 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 | The provider of the image (should be `Oracle Corporation` for base images in this repo) | All images | +| issues | URL where issues and questions can be posted (should be `https://github.com/oracle/docker-images/issues` for base images in this repo | All images | +| maintainer | Name of the maintainer | All images | +| 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:
  • `volume.data.dir1`
  • `volume.data.dir2`
| For all images that have data that should be persisted outside the 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:
  • `port.app.http`
  • `port.app.https`
| For all images that have ports that should be exposed outside the container | + +For example, for the Oracle Database 18c XE image we use the following labels: + +``` +LABEL "provider"="Oracle Corporation" \ + "issues"="https://github.com/oracle/docker-images/issues" \ + "maintainer"="Gerald Venzl" \ + "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 +128,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 +151,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) 2020, Oracle and/or its affiliates. All rights reserved.* From b1ed4722d64c3638c6de162e2b4e16460cc00ae6 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Thu, 26 Mar 2020 15:18:23 -0700 Subject: [PATCH 10/17] Updates based on review Signed-off-by: Gerald Venzl --- CONTRIBUTING.md | 14 +++++++------- .../SingleInstance/samples/prebuiltdb/README.md | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76c5552dc6..4ce3639075 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,24 +81,24 @@ a pull request. 1. Extend an existing product image wherever possible. For example, if your product requires WebLogic, then extend the WebLogic image instead of creating your own WebLogic installation. -2. If you can't extend an existing image, your image must use the +1. If you can't extend an existing image, your image must use the `oraclelinux:7-slim` base image as this image provides the smallest attack surface and is updated whenever a CVE errata is published. -3. Re-use existing scripts wherever possible. If a particular base image or +1. Re-use existing scripts wherever possible. If a particular base image or script doesn't have the functionality you need, open an issue and work with the image owner to implement it. -4. Specify a version in the `FROM` directive, i.e. use +1. Specify a version in the `FROM` directive, i.e. use `FROM oraclelinux:7-slim` or `FROM java/serverjre:8`. -5. All images must provide a `CMD` or `ENTRYPOINT`. If your image is designed +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. -6. 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: +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 | The provider of the image (should be `Oracle Corporation` for base images in this repo) | All images | | issues | URL where issues and questions can be posted (should be `https://github.com/oracle/docker-images/issues` for base images in this repo | All images | -| maintainer | Name of the maintainer | All images | +| maintainer | Name of the maintainer team | All images | | 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:
  • `volume.data.dir1`
  • `volume.data.dir2`
| For all images that have data that should be persisted outside the 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:
  • `port.app.http`
  • `port.app.https`
| For all images that have ports that should be exposed outside the container | @@ -151,4 +151,4 @@ any defaults that are used if no input is provided. gracefully fail if that value is not provided. -*Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.* +*Copyright (c) 2017, 2020 Oracle and/or its affiliates.* diff --git a/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md b/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md index 35adff1688..d9e28f6429 100644 --- a/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md +++ b/OracleDatabase/SingleInstance/samples/prebuiltdb/README.md @@ -66,5 +66,4 @@ And run: docker-compose up ``` -# Copyright -Copyright (c) 2014-2020 Oracle and/or its affiliates. All rights reserved. +*Copyright (c) 2014, 2020 Oracle and/or its affiliates.* From 9e2656620ea8b60bd97775055748312aa6747d9e Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Thu, 26 Mar 2020 15:29:21 -0700 Subject: [PATCH 11/17] Update provider as per discussion Signed-off-by: Gerald Venzl --- CONTRIBUTING.md | 2 +- .../SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe | 2 +- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee | 2 +- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 | 2 +- OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile | 2 +- OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile | 2 +- OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 +- OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4ce3639075..cb4134f2a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,7 +96,7 @@ image to be useful. | Label | Value | Applicability | | -------- | ----- | ------------- | -| provider | The provider of the image (should be `Oracle Corporation` for base images in this repo) | All images | +| provider | The provider of the image (should be `Oracle` for base images in this repo) | All images | | issues | URL where issues and questions can be posted (should be `https://github.com/oracle/docker-images/issues` for base images in this repo | All images | | maintainer | Name of the maintainer team | All images | | 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:
  • `volume.data.dir1`
  • `volume.data.dir2`
| For all images that have data that should be persisted outside the container | diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index 57adf333d3..246f5e8672 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe @@ -30,7 +30,7 @@ FROM oraclelinux:7-slim # Labels # ------ -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ "volume.data"="/u01/app/oracle/oradata" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee index 1675db88a4..62aa82cbc3 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee @@ -25,7 +25,7 @@ FROM oraclelinux:7-slim as base # Labels # ------ -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 index 69f2c6d5cc..1a7e697ec4 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 +++ b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 @@ -25,7 +25,7 @@ FROM oraclelinux:7-slim as base # Labels # ------ -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile index 08aa2b262c..072a470134 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile @@ -24,7 +24,7 @@ FROM oraclelinux:7-slim as base # Labels # ------ -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile index 4583dc19ad..24e2a1f9cf 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile @@ -24,7 +24,7 @@ FROM oraclelinux:7-slim as base # Labels # ------ -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe index 67efacc7b8..75b13da7e6 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe +++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe @@ -23,7 +23,7 @@ FROM oraclelinux:7-slim # Labels # ------ -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile index 1dfc8b4065..69208076b2 100644 --- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile +++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile @@ -24,7 +24,7 @@ FROM oraclelinux:7-slim as base # Labels # ------ -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ From a3f1c5a7000b87f5a27a6a4ff34bc148961e207d Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Fri, 27 Mar 2020 12:41:26 -0700 Subject: [PATCH 12/17] Remove maintainer, update copyright Signed-off-by: Gerald Venzl --- CONTRIBUTING.md | 2 -- .../SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe | 3 +-- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee | 3 +-- .../SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 | 3 +-- OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile | 3 +-- OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile | 3 +-- OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 3 +-- OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile | 3 +-- 8 files changed, 7 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb4134f2a3..8862d582cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,7 +98,6 @@ image to be useful. | -------- | ----- | ------------- | | provider | The provider of the image (should be `Oracle` for base images in this repo) | All images | | issues | URL where issues and questions can be posted (should be `https://github.com/oracle/docker-images/issues` for base images in this repo | All images | -| maintainer | Name of the maintainer team | All images | | 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:
  • `volume.data.dir1`
  • `volume.data.dir2`
| For all images that have data that should be persisted outside the 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:
  • `port.app.http`
  • `port.app.https`
| For all images that have ports that should be exposed outside the container | @@ -107,7 +106,6 @@ For example, for the Oracle Database 18c XE image we use the following labels: ``` LABEL "provider"="Oracle Corporation" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe index 246f5e8672..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 # -------------------------- @@ -32,7 +32,6 @@ FROM oraclelinux:7-slim # ------ LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/u01/app/oracle/oradata" \ "volume.setup.location1"="/u01/app/oracle/scripts/startup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee index 62aa82cbc3..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 # -------------------------- @@ -27,7 +27,6 @@ FROM oraclelinux:7-slim as base # ------ LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 b/OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2 index 1a7e697ec4..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 # -------------------------- @@ -27,7 +27,6 @@ FROM oraclelinux:7-slim as base # ------ LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile index 072a470134..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 # -------------------------- @@ -26,7 +26,6 @@ FROM oraclelinux:7-slim as base # ------ LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile index 24e2a1f9cf..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 # -------------------------- @@ -26,7 +26,6 @@ FROM oraclelinux:7-slim as base # ------ LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe index 75b13da7e6..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 # -------------------------- @@ -25,7 +25,6 @@ FROM oraclelinux:7-slim # ------ LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile index 69208076b2..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 # -------------------------- @@ -26,7 +26,6 @@ FROM oraclelinux:7-slim as base # ------ LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ - "maintainer"="Gerald Venzl" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ "volume.setup.location2"="/docker-entrypoint-initdb.d/setup" \ From d93f36bae212936b48b2d0801e4e2172ee9e690e Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Fri, 27 Mar 2020 12:42:42 -0700 Subject: [PATCH 13/17] Update label example Signed-off-by: Gerald Venzl --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8862d582cb..522d0c727e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -104,7 +104,7 @@ image to be useful. For example, for the Oracle Database 18c XE image we use the following labels: ``` -LABEL "provider"="Oracle Corporation" \ +LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/docker-images/issues" \ "volume.data"="/opt/oracle/oradata" \ "volume.setup.location1"="/opt/oracle/scripts/setup" \ From 668a0db765df5bdf1b01b0ef37a5262ad09cd29c Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Fri, 27 Mar 2020 12:46:37 -0700 Subject: [PATCH 14/17] Update copyright header Signed-off-by: Gerald Venzl --- OracleDatabase/SingleInstance/tests/runContainerTests193.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OracleDatabase/SingleInstance/tests/runContainerTests193.sh b/OracleDatabase/SingleInstance/tests/runContainerTests193.sh index 8211d8253c..47fd7aca3c 100755 --- a/OracleDatabase/SingleInstance/tests/runContainerTests193.sh +++ b/OracleDatabase/SingleInstance/tests/runContainerTests193.sh @@ -1,7 +1,7 @@ #!/bin/bash # LICENSE UPL 1.0 # -# Copyright (c) 1982-2020 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2020 Oracle and/or its affiliates. # # Since: March, 2020 # Author: gerald.venzl@oracle.com From ffc900a97a613380025bcc616e1341bd364c9e91 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Fri, 27 Mar 2020 12:47:12 -0700 Subject: [PATCH 15/17] Update copyright header Signed-off-by: Gerald Venzl --- OracleDatabase/SingleInstance/tests/runImageBuildTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OracleDatabase/SingleInstance/tests/runImageBuildTests.sh b/OracleDatabase/SingleInstance/tests/runImageBuildTests.sh index 0064737762..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-2020 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 From 3f94f7a0882a14b6a26a8a16f46fceadc0651c3e Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Mon, 30 Mar 2020 09:08:44 -0700 Subject: [PATCH 16/17] Remove deprecated maintainer instruction from sample Signed-off-by: Gerald Venzl --- .../SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.ee | 4 ---- .../SingleInstance/samples/applypatch/12.1.0.2/Dockerfile.se2 | 4 ---- .../SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.ee | 4 ---- .../SingleInstance/samples/applypatch/12.2.0.1/Dockerfile.se2 | 4 ---- 4 files changed, 16 deletions(-) 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" \ From 39893f655d21488adb8c4e7c78c1b0ee1a0a5290 Mon Sep 17 00:00:00 2001 From: Gerald Venzl Date: Wed, 1 Apr 2020 16:42:54 -0700 Subject: [PATCH 17/17] Update contributing Signed-off-by: Gerald Venzl --- CONTRIBUTING.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 522d0c727e..55efa2ac9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,10 +96,11 @@ image to be useful. | Label | Value | Applicability | | -------- | ----- | ------------- | -| provider | The provider of the image (should be `Oracle` for base images in this repo) | All images | -| issues | URL where issues and questions can be posted (should be `https://github.com/oracle/docker-images/issues` for base images in this repo | All images | -| 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:
  • `volume.data.dir1`
  • `volume.data.dir2`
| For all images that have data that should be persisted outside the 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:
  • `port.app.http`
  • `port.app.https`
| For all images that have ports that should be exposed outside the container | +| 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:
  • `volume.data.dir1`
  • `volume.data.dir2`
| 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:
  • `port.app.http`
  • `port.app.https`
| Mandatory for all images that require externally accessible port mappings. | For example, for the Oracle Database 18c XE image we use the following labels: