pyrox.dev
openshift: 3.9.0 -> 3.10.0 (#44484)
authored by Jens Binkert and committed by xeji f5cf11b2 62d0b676
+12
-8
pkgs/applications/networking/cluster/openshift/default.nix
+12
-8
pkgs/applications/networking/cluster/openshift/default.nix
···
9
with lib;
10
11
let
12
-
version = "3.9.0";
13
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
14
versionMajor = ver 0;
15
versionMinor = ver 1;
16
versionPatch = ver 2;
17
-
gitCommit = "191fece";
18
# version is in vendor/k8s.io/kubernetes/pkg/version/base.go
19
-
k8sversion = "v1.9.1";
20
-
k8sgitcommit = "a0ce1bc657";
21
in stdenv.mkDerivation rec {
22
name = "openshift-origin-${version}";
23
inherit version;
···
26
owner = "openshift";
27
repo = "origin";
28
rev = "v${version}";
29
-
sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78";
30
};
31
32
# go > 1.10
···
38
patchPhase = ''
39
patchShebangs ./hack
40
41
-
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
42
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
43
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
44
45
-
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
46
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
47
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
48
49
-
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
50
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
51
'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir'
52
'';
···
61
echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs
62
echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs
63
echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs
64
export OS_VERSION_FILE="os-version-defs"
65
export CC=clang
66
make all WHAT='${concatStringsSep " " components}'
···
9
with lib;
10
11
let
12
+
version = "3.10.0";
13
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
14
versionMajor = ver 0;
15
versionMinor = ver 1;
16
versionPatch = ver 2;
17
+
gitCommit = "dd10d17";
18
# version is in vendor/k8s.io/kubernetes/pkg/version/base.go
19
+
k8sversion = "v1.10.0";
20
+
k8sgitcommit = "b81c8f8";
21
+
k8sgitMajor = "0";
22
+
k8sgitMinor = "1";
23
in stdenv.mkDerivation rec {
24
name = "openshift-origin-${version}";
25
inherit version;
···
28
owner = "openshift";
29
repo = "origin";
30
rev = "v${version}";
31
+
sha256 = "13aglz005jl48z17vnggkvr39l5h6jcqgkfyvkaz4c3jakms1hi9";
32
};
33
34
# go > 1.10
···
40
patchPhase = ''
41
patchShebangs ./hack
42
43
+
substituteInPlace pkg/oc/clusterup/docker/host/host.go \
44
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
45
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
46
47
+
substituteInPlace pkg/oc/clusterup/docker/host/host.go \
48
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
49
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
50
51
+
substituteInPlace pkg/oc/clusterup/docker/host/host.go \
52
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
53
'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir'
54
'';
···
63
echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs
64
echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs
65
echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs
66
+
echo "KUBE_GIT_MAJOR=${k8sgitMajor}" >> os-version-defs
67
+
echo "KUBE_GIT_MINOR=${k8sgitMinor}" >> os-version-defs
68
export OS_VERSION_FILE="os-version-defs"
69
export CC=clang
70
make all WHAT='${concatStringsSep " " components}'