Remove VOLUME, EXPOSE, MAINTAINER, add labels

Signed-off-by: Gerald Venzl <gerald.venzl@oracle.com>
oracle · Mar 25, 2020 · 295002a · 295002a
1 parent 725cf02
commit 295002a
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 28 deletions.
diff --git 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 <gerald.venzl@oracle.com>
+LABEL "maintainer"="Gerald Venzl <gerald.venzl@oracle.com>" \
+      "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
@@ -23,9 +23,12 @@
 # ---------------
 FROM oraclelinux:7-slim as base
 
-# Maintainer
+# Labels
 # ----------
-MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
+LABEL "maintainer"="Gerald Venzl <gerald.venzl@oracle.com>" \
+      "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
@@ -23,9 +23,12 @@
 # ---------------
 FROM oraclelinux:7-slim as base
 
-# Maintainer
+# Labels
 # ----------
-MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
+LABEL "maintainer"="Gerald Venzl <gerald.venzl@oracle.com>" \
+      "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
@@ -22,9 +22,12 @@
 # ---------------
 FROM oraclelinux:7-slim as base
 
-# Maintainer
+# Labels
 # ----------
-MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
+LABEL "maintainer"="Gerald Venzl <gerald.venzl@oracle.com>" \
+      "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
@@ -22,9 +22,12 @@
 # ---------------
 FROM oraclelinux:7-slim as base
 
-# Maintainer
+# Labels
 # ----------
-MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
+LABEL "maintainer"="Gerald Venzl <gerald.venzl@oracle.com>" \
+      "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
@@ -21,9 +21,13 @@
 # ---------------
 FROM oraclelinux:7-slim
 
-# Maintainer
+# Labels
 # ----------
-MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
+LABEL "maintainer"="Gerald Venzl <gerald.venzl@oracle.com>" \
+      "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
@@ -22,9 +22,12 @@
 # ---------------
 FROM oraclelinux:7-slim as base
 
-# Maintainer
+# Labels
 # ----------
-MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
+LABEL "maintainer"="Gerald Venzl <gerald.venzl@oracle.com>" \
+      "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