Merge pull request #28345 from moretea/openshift-origin

openshift: 1.5.0 -> 3.6.0

Changed files
+16 -5
pkgs
applications
networking
cluster
openshift
+16 -5
pkgs/applications/networking/cluster/openshift/default.nix
···
-
{ stdenv, fetchFromGitHub, which, buildGoPackage }:
+
{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }:
let
-
version = "1.5.0";
+
version = "3.6.0";
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
versionMajor = ver 0;
versionMinor = ver 1;
···
owner = "openshift";
repo = "origin";
rev = "v${version}";
-
sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v";
+
sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r";
};
buildInputs = [ which ];
···
goPackagePath = null;
patchPhase = ''
patchShebangs ./hack
+
substituteInPlace pkg/bootstrap/docker/host/host.go \
+
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
+
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
+
+
substituteInPlace pkg/bootstrap/docker/host/host.go \
+
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
+
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
+
+
substituteInPlace pkg/bootstrap/docker/host/host.go \
+
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
+
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
'';
buildPhase = ''
cd go/src/origin-v${version}-src
# Openshift build require this variables to be set
# unless there is a .git folder which is not the case with fetchFromGitHub
-
export OS_GIT_VERSION=${version}
+
export OS_GIT_VERSION=v${version}
export OS_GIT_MAJOR=${versionMajor}
export OS_GIT_MINOR=${versionMinor}
make build
···
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20;
homepage = http://www.openshift.org;
-
maintainers = with maintainers; [offline bachp];
+
maintainers = with maintainers; [offline bachp moretea];
platforms = platforms.linux;
};
}