dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #28345 from moretea/openshift-origin

Browse Source 
openshift: 1.5.0 -> 3.6.0
This commit is contained in:
Jörg Thalheim 2017-09-14 20:36:57 +01:00 committed by GitHub
commit 9366d013f0
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/networking/cluster/openshift/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, which, buildGoPackage }: { stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }:
let let
version = "1.5.0"; version = "3.6.0";
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
versionMajor = ver 0; versionMajor = ver 0;
versionMinor = ver 1; versionMinor = ver 1;
@ -14,7 +14,7 @@ in buildGoPackage rec {
owner = "openshift"; owner = "openshift";
repo = "origin"; repo = "origin";
rev = "v${version}"; rev = "v${version}";
sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v"; sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r";
}; };
buildInputs = [ which ]; buildInputs = [ which ];
@ -22,13 +22,24 @@ in buildGoPackage rec {
goPackagePath = null; goPackagePath = null;
patchPhase = '' patchPhase = ''
patchShebangs ./hack 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 = '' buildPhase = ''
cd go/src/origin-v${version}-src cd go/src/origin-v${version}-src
# Openshift build require this variables to be set # Openshift build require this variables to be set
# unless there is a .git folder which is not the case with fetchFromGitHub # 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_MAJOR=${versionMajor}
export OS_GIT_MINOR=${versionMinor} export OS_GIT_MINOR=${versionMinor}
make build make build
@ -43,7 +54,7 @@ in buildGoPackage rec {
description = "Build, deploy, and manage your applications with Docker and Kubernetes"; description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20; license = licenses.asl20;
homepage = http://www.openshift.org; homepage = http://www.openshift.org;
maintainers = with maintainers; [offline bachp]; maintainers = with maintainers; [offline bachp moretea];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }