Added OpenContainers image-spec labels to the currently updated tags. #8722
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Avi Miller <avi.miller@oracle.com>
|
See #3540 (comment), especially:
(Speaking specifically of that bare |
|
(You likely intended to use |
|
Well, no. I was maintaining (see what I did there?) the deprecated |
|
(Slightly more minutes are required to force push the images, though) |
Signed-off-by: Avi Miller <me@dje.li>
Diff for 175e8ba:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 75c361c..ba794a8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
Maintainers: Oracle Linux Product Team <ol-ovm-info_ww@oracle.com> (@Oracle)
GitRepo: https://github.com/oracle/container-images.git
GitCommit: 01a15ec99c7470a3391c691509db1759b41eaf66
-amd64-GitCommit: 4094e84f7711e330510bcceae10aaec6d82f5ce7
+amd64-GitCommit: 283700269a887af4a45ba9bc614d8ad777cf702c
amd64-GitFetch: refs/heads/dist-amd64
-arm64v8-GitCommit: 493b79e2372fbc371b19652580604c4603c81f50
+arm64v8-GitCommit: 154f9654e60f610896647ea9de43e383b6cc2850
arm64v8-GitFetch: refs/heads/dist-arm64v8
Tags: 6-slim
diff --git a/oraclelinux_6-slim/Dockerfile b/oraclelinux_6-slim/Dockerfile
index 0d4acdd..e59493f 100644
--- a/oraclelinux_6-slim/Dockerfile
+++ b/oraclelinux_6-slim/Dockerfile
@@ -1,5 +1,13 @@
FROM scratch
-MAINTAINER Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>
+LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>" \
+ "org.opencontainers.image.url"="https://github.com/oracle/container-images" \
+ "org.opencontainers.image.source"="https://github.com/oracle/container-images/tree/dist-amd64/6-slim" \
+ "org.opencontainers.image.vendor"="Oracle America, Inc" \
+ "org.opencontainers.image.title"="Oracle Linux 6 (slim)" \
+ "org.opencontainers.image.description"="Oracle Linux is an open-source \
+ operating system available under the GNU General Public License (GPLv2) and \
+ is suitable for both general purpose or Oracle workloads."
+
ADD oraclelinux-6-slim-amd64-rootfs.tar.xz /
# overwrite this with 'CMD []' in a dependent Dockerfile
diff --git a/oraclelinux_6/Dockerfile b/oraclelinux_6/Dockerfile
index 7336505..d487ee1 100644
--- a/oraclelinux_6/Dockerfile
+++ b/oraclelinux_6/Dockerfile
@@ -1,5 +1,13 @@
FROM scratch
-MAINTAINER Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>
+LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>" \
+ "org.opencontainers.image.url"="https://github.com/oracle/container-images" \
+ "org.opencontainers.image.source"="https://github.com/oracle/container-images/tree/dist-amd64/6.10" \
+ "org.opencontainers.image.vendor"="Oracle America, Inc" \
+ "org.opencontainers.image.title"="Oracle Linux 6" \
+ "org.opencontainers.image.description"="Oracle Linux is an open-source \
+ operating system available under the GNU General Public License (GPLv2) and \
+ is suitable for both general purpose or Oracle workloads."
+
ADD oraclelinux-6.10-amd64-rootfs.tar.xz /
# overwrite this with 'CMD []' in a dependent Dockerfile
diff --git a/oraclelinux_7-slim/Dockerfile b/oraclelinux_7-slim/Dockerfile
index 02bdd6b..1e2c6fc 100644
--- a/oraclelinux_7-slim/Dockerfile
+++ b/oraclelinux_7-slim/Dockerfile
@@ -1,5 +1,13 @@
FROM scratch
-MAINTAINER Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>
+LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>" \
+ "org.opencontainers.image.url"="https://github.com/oracle/container-images" \
+ "org.opencontainers.image.source"="https://github.com/oracle/container-images/tree/dist-amd64/7-slim" \
+ "org.opencontainers.image.vendor"="Oracle America, Inc" \
+ "org.opencontainers.image.title"="Oracle Linux 7 (slim)" \
+ "org.opencontainers.image.description"="Oracle Linux is an open-source \
+ operating system available under the GNU General Public License (GPLv2) and \
+ is suitable for both general purpose or Oracle workloads."
+
ADD oraclelinux-7-slim-amd64-rootfs.tar.xz /
# overwrite this with 'CMD []' in a dependent Dockerfile
diff --git a/oraclelinux_7/Dockerfile b/oraclelinux_7/Dockerfile
index fa05c58..fd963ec 100644
--- a/oraclelinux_7/Dockerfile
+++ b/oraclelinux_7/Dockerfile
@@ -1,5 +1,13 @@
FROM scratch
-MAINTAINER Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>
+LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>" \
+ "org.opencontainers.image.url"="https://github.com/oracle/container-images" \
+ "org.opencontainers.image.source"="https://github.com/oracle/container-images/tree/dist-amd64/7.8" \
+ "org.opencontainers.image.vendor"="Oracle America, Inc" \
+ "org.opencontainers.image.title"="Oracle Linux 7" \
+ "org.opencontainers.image.description"="Oracle Linux is an open-source \
+ operating system available under the GNU General Public License (GPLv2) and \
+ is suitable for both general purpose or Oracle workloads."
+
ADD oraclelinux-7-amd64-rootfs.tar.xz /
# overwrite this with 'CMD []' in a dependent Dockerfile
diff --git a/oraclelinux_8-slim/Dockerfile b/oraclelinux_8-slim/Dockerfile
index 205dc8b..99755db 100644
--- a/oraclelinux_8-slim/Dockerfile
+++ b/oraclelinux_8-slim/Dockerfile
@@ -1,5 +1,14 @@
FROM scratch
-MAINTAINER Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>
+
+LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>" \
+ "org.opencontainers.image.url"="https://github.com/oracle/container-images" \
+ "org.opencontainers.image.source"="https://github.com/oracle/container-images/tree/dist-amd64/8-slim" \
+ "org.opencontainers.image.vendor"="Oracle America, Inc" \
+ "org.opencontainers.image.title"="Oracle Linux 8 (slim)" \
+ "org.opencontainers.image.description"="Oracle Linux is an open-source \
+ operating system available under the GNU General Public License (GPLv2) and \
+ is suitable for both general purpose or Oracle workloads."
+
ADD oraclelinux-8-slim-amd64-rootfs.tar.xz /
# overwrite this with 'CMD []' in a dependent Dockerfile
diff --git a/oraclelinux_8/Dockerfile b/oraclelinux_8/Dockerfile
index 9cb16e6..d5039bc 100644
--- a/oraclelinux_8/Dockerfile
+++ b/oraclelinux_8/Dockerfile
@@ -1,5 +1,13 @@
FROM scratch
-MAINTAINER Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>
+LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>" \
+ "org.opencontainers.image.url"="https://github.com/oracle/container-images" \
+ "org.opencontainers.image.source"="https://github.com/oracle/container-images/tree/dist-amd64/8.2" \
+ "org.opencontainers.image.vendor"="Oracle America, Inc" \
+ "org.opencontainers.image.title"="Oracle Linux 8" \
+ "org.opencontainers.image.description"="Oracle Linux is an open-source \
+ operating system available under the GNU General Public License (GPLv2) and \
+ is suitable for both general purpose or Oracle workloads."
+
ADD oraclelinux-8-amd64-rootfs.tar.xz /
# overwrite this with 'CMD []' in a dependent Dockerfile |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Yet another packaging update.
Signed-off-by: Avi Miller avi.miller@oracle.com