From 8714a429b67c7bb3b83183bc67010d417d62c8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 11 Sep 2018 15:33:49 +0200 Subject: [PATCH 1/6] Initial 3.9/f28 commit --- Dockerfile | 35 +++++++++++++++++++++++++++++++++++ README.md | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b363e82 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,35 @@ +# +# This is the base image from which all OpenShift Origin images inherit. Only packages +# common to all downstream images should be here. +# +# The standard name for this image is openshift/origin-base +# +FROM registry.fedoraproject.org/fedora:28 + +ENV NAME=origin-base \ + VERSION=3.9 \ + ARCH=x86_64 + +RUN INSTALL_PKGS=" \ + which git tar wget hostname util-linux bsdtar \ + socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs \ + xfsprogs lsof device-mapper-persistent-data ceph-common \ + " && \ + dnf install -y ${INSTALL_PKGS} && \ + dnf clean all && \ + mkdir -p /var/lib/origin + +LABEL io.k8s.display-name="OpenShift Origin Fedora 28 Base" \ + io.k8s.description="This is the base image from which all OpenShift Origin images inherit." \ + io.openshift.tags="openshift,base" \ + summary="This is the base image from which all OpenShift Origin images inherit." \ + maintainer="Jakub Čajka " \ + License="GPLv2+" \ + name="$FGC/$NAME" \ + com.redhat.component="origin" \ + version="$VERSION" \ + architecture="$ARCH" \ + usage="This is the base image from which all OpenShift Origin images inherit." \ + +COPY README.md README.md + diff --git a/README.md b/README.md index 34f2a38..f0c8832 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # origin-base -The origin-base package \ No newline at end of file +Base origin image on top which most of the other dependent origin images are based on. From 40e47c515db9ddec75ea0e044889aff55c0e44e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 11 Sep 2018 15:43:20 +0200 Subject: [PATCH 2/6] Don't include README --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b363e82..9ed1d2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,3 @@ LABEL io.k8s.display-name="OpenShift Origin Fedora 28 Base" \ version="$VERSION" \ architecture="$ARCH" \ usage="This is the base image from which all OpenShift Origin images inherit." \ - -COPY README.md README.md - From 892f78da8ade60dd12bebc0f12374427c4cea15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 11 Sep 2018 15:46:35 +0200 Subject: [PATCH 3/6] Fix multi line line --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ed1d2f..73231e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,4 +29,4 @@ LABEL io.k8s.display-name="OpenShift Origin Fedora 28 Base" \ com.redhat.component="origin" \ version="$VERSION" \ architecture="$ARCH" \ - usage="This is the base image from which all OpenShift Origin images inherit." \ + usage="This is the base image from which all OpenShift Origin images inherit." From 135329cf6de9c57db0ff08424f54dfbcceed3279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Wed, 12 Sep 2018 10:54:00 +0200 Subject: [PATCH 4/6] Add back README --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 73231e0..32c8dca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,3 +30,5 @@ LABEL io.k8s.display-name="OpenShift Origin Fedora 28 Base" \ version="$VERSION" \ architecture="$ARCH" \ usage="This is the base image from which all OpenShift Origin images inherit." + +COPY README.md README.md From 004ec2ad5c07871c4bf5b7159f338910654cde39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Wed, 19 Sep 2018 13:57:23 +0200 Subject: [PATCH 5/6] No utf-8 encoding in the OSBS --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 32c8dca..7084e41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ LABEL io.k8s.display-name="OpenShift Origin Fedora 28 Base" \ io.k8s.description="This is the base image from which all OpenShift Origin images inherit." \ io.openshift.tags="openshift,base" \ summary="This is the base image from which all OpenShift Origin images inherit." \ - maintainer="Jakub Čajka " \ + maintainer="Jakub Cajka " \ License="GPLv2+" \ name="$FGC/$NAME" \ com.redhat.component="origin" \ From 2bec03e77a266a363f12b18f16ca47059031a4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Fri, 21 Sep 2018 09:46:48 +0200 Subject: [PATCH 6/6] Fix up the BZ component --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7084e41..ff8891e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ LABEL io.k8s.display-name="OpenShift Origin Fedora 28 Base" \ maintainer="Jakub Cajka " \ License="GPLv2+" \ name="$FGC/$NAME" \ - com.redhat.component="origin" \ + com.redhat.component="origin-base" \ version="$VERSION" \ architecture="$ARCH" \ usage="This is the base image from which all OpenShift Origin images inherit."