Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove volume expose #1560

Merged
merged 17 commits into from
Apr 1, 2020
Merged

Remove volume expose #1560

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
295002a
Remove VOLUME, EXPOSE, MAINTAINER, add labels
gvenzl Mar 25, 2020
7c62ebb
Add setup and startup volumes
gvenzl Mar 25, 2020
2f075dc
change volume.oradata to volume.data (more generic)
gvenzl Mar 25, 2020
4842c4c
Add 19c tests
gvenzl Mar 25, 2020
054a074
Add provider and issues, change maintainer (no email)
gvenzl Mar 25, 2020
aef3fd8
Change order of labels for Contributing
gvenzl Mar 26, 2020
d4c6254
Update 11g XE volume paths
gvenzl Mar 26, 2020
886fa13
Update prebuild example
gvenzl Mar 26, 2020
554ab95
Update contributing to reflect labels
gvenzl Mar 26, 2020
b1ed472
Updates based on review
gvenzl Mar 26, 2020
9e26566
Update provider as per discussion
gvenzl Mar 26, 2020
a3f1c5a
Remove maintainer, update copyright
gvenzl Mar 27, 2020
d93f36b
Update label example
gvenzl Mar 27, 2020
668a0db
Update copyright header
gvenzl Mar 27, 2020
ffc900a
Update copyright header
gvenzl Mar 27, 2020
3f94f7a
Remove deprecated maintainer instruction from sample
gvenzl Mar 30, 2020
39893f6
Update contributing
gvenzl Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,29 @@ 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 | 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.<br/>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.<br/>Use hierarchical nesting for multiple volumes of the same type, for example:<br/><ul><li>`volume.data.dir1`</li><li>`volume.data.dir2`</li></ul> | 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.<br/>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.<br/>Use hierarchical nesting for multiple ports of the same type, for example:<br/><ul><li>`port.app.http`</li><li>`port.app.https`</li></ul> | 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" \
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
"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

Expand All @@ -103,10 +126,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
Expand All @@ -130,4 +149,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.*
18 changes: 12 additions & 6 deletions OracleDatabase/SingleInstance/dockerfiles/11.2.0.2/Dockerfile.xe
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# --------------------------
Expand Down Expand Up @@ -28,9 +28,17 @@
# ---------------
FROM oraclelinux:7-slim

# Maintainer
# ----------
MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
# Labels
# ------
LABEL "provider"="Oracle" \
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
"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)
# -------------------------------------------------------------
Expand Down Expand Up @@ -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

Expand Down
18 changes: 12 additions & 6 deletions OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.ee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# --------------------------
Expand All @@ -23,9 +23,17 @@
# ---------------
FROM oraclelinux:7-slim as base

# Maintainer
# ----------
MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
# Labels
# ------
LABEL "provider"="Oracle" \
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
"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)
# -------------------------------------------------------------
Expand Down Expand Up @@ -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

Expand Down
18 changes: 12 additions & 6 deletions OracleDatabase/SingleInstance/dockerfiles/12.1.0.2/Dockerfile.se2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# --------------------------
Expand All @@ -23,9 +23,17 @@
# ---------------
FROM oraclelinux:7-slim as base

# Maintainer
# ----------
MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
# Labels
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
# ------
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)
# -------------------------------------------------------------
Expand Down Expand Up @@ -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

Expand Down
18 changes: 12 additions & 6 deletions OracleDatabase/SingleInstance/dockerfiles/12.2.0.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# --------------------------
Expand All @@ -22,9 +22,17 @@
# ---------------
FROM oraclelinux:7-slim as base

# Maintainer
# ----------
MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
# Labels
# ------
LABEL "provider"="Oracle" \
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
"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)
# -------------------------------------------------------------
Expand Down Expand Up @@ -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

Expand Down
18 changes: 12 additions & 6 deletions OracleDatabase/SingleInstance/dockerfiles/18.3.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# --------------------------
Expand All @@ -22,9 +22,17 @@
# ---------------
FROM oraclelinux:7-slim as base

# Maintainer
# ----------
MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
# Labels
# ------
LABEL "provider"="Oracle" \
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
"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)
# -------------------------------------------------------------
Expand Down Expand Up @@ -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

Expand Down
19 changes: 13 additions & 6 deletions OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# --------------------------
Expand All @@ -21,9 +21,18 @@
# ---------------
FROM oraclelinux:7-slim

# Maintainer
# ----------
MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
# Labels
# ------
LABEL "provider"="Oracle" \
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
"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)
# -------------------------------------------------------------
Expand Down Expand Up @@ -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

Expand Down
18 changes: 12 additions & 6 deletions OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# --------------------------
Expand All @@ -22,9 +22,17 @@
# ---------------
FROM oraclelinux:7-slim as base

# Maintainer
# ----------
MAINTAINER Gerald Venzl <gerald.venzl@oracle.com>
# Labels
# ------
LABEL "provider"="Oracle" \
gvenzl marked this conversation as resolved.
Show resolved Hide resolved
"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)
# -------------------------------------------------------------
Expand Down Expand Up @@ -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

Expand Down
Loading