From ec2f2f164b4b601dab7ded4b329769969d51b235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 11 Sep 2018 12:24:32 +0200 Subject: [PATCH 1/3] Initial f27/3.6 commit --- Dockerfile | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8ca1351 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,34 @@ +# +# 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:27 + +ENV NAME=origin-base \ + VERSION=3.6 \ + 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} && \ + rpm -V ${INSTALL_PKGS} && \ + dnf clean all && \ + mkdir -p /var/lib/origin + +LABEL io.k8s.display-name="OpenShift Origin Fedora 27 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="$NAME" \ + version="$VERSION" \ + architecture="$ARCH" \ + usage="This is the base image from which all OpenShift Origin images inherit." + From 2fe8ffd932c2f0a96e6ac6848a2ff9c355763183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 11 Sep 2018 12:50:33 +0200 Subject: [PATCH 2/3] Skip RPM verifie for now --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ca1351..ae81958 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN INSTALL_PKGS=" \ xfsprogs lsof device-mapper-persistent-data ceph-common \ " && \ dnf install -y ${INSTALL_PKGS} && \ - rpm -V ${INSTALL_PKGS} && \ +# rpm -V ${INSTALL_PKGS} && \ dnf clean all && \ mkdir -p /var/lib/origin From 211d3a56d1e0221f65c5ef689e41eabd14fd8765 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Tue, 11 Sep 2018 18:52:46 +0200 Subject: [PATCH 3/3] Koji does not support non UTF-8 Char Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae81958..e8d6806 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ LABEL io.k8s.display-name="OpenShift Origin Fedora 27 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="$NAME" \