From 37f2375c37303a545fa8e752c3b369b9709186b8 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Sat, 15 Apr 2017 19:40:55 -0500 Subject: [PATCH] Rename images Signed-off-by: Ilya Dmitrichenko --- projects/kubernetes/Makefile | 12 ++++----- projects/kubernetes/common.rb | 2 +- projects/kubernetes/image-cache/Dockerfile | 2 +- projects/kubernetes/kube-master.yml | 30 +++++++++++----------- projects/kubernetes/kube-node.yml | 28 ++++++++++---------- projects/kubernetes/mounts.rb | 2 +- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile index b8878443a..052802810 100644 --- a/projects/kubernetes/Makefile +++ b/projects/kubernetes/Makefile @@ -12,10 +12,10 @@ build-container-images: $(BOX_PLANS) ; done push-container-images: build-container-images cache-images - docker image push mobylinux/kubernetes:latest - docker image push mobylinux/kubernetes:latest-mounts - docker image push mobylinux/kubernetes:latest-image-cache-common - docker image push mobylinux/kubernetes:latest-image-cache-control-plane + docker image push linuxkit/kubernetes:latest + docker image push linuxkit/kubernetes:latest-mounts + docker image push linuxkit/kubernetes:latest-image-cache-common + docker image push linuxkit/kubernetes:latest-image-cache-control-plane build-vm-images: kube-master-initrd.img kube-node-initrd.img @@ -53,9 +53,9 @@ cache-images: do $(MAKE) "image-cache/common/$${image}.tar" \ ; done cp image-cache/Dockerfile image-cache/.dockerignore image-cache/common - docker image build -t mobylinux/kubernetes:latest-image-cache-common image-cache/common + docker image build -t linuxkit/kubernetes:latest-image-cache-common image-cache/common for image in $(CONTROL_PLANE_IMAGES) ; \ do $(MAKE) "image-cache/control-plane/$${image}.tar" \ ; done cp image-cache/Dockerfile image-cache/.dockerignore image-cache/control-plane - docker image build -t mobylinux/kubernetes:latest-image-cache-control-plane image-cache/control-plane + docker image build -t linuxkit/kubernetes:latest-image-cache-control-plane image-cache/control-plane diff --git a/projects/kubernetes/common.rb b/projects/kubernetes/common.rb index 8fb0c2f52..133a4c2a2 100644 --- a/projects/kubernetes/common.rb +++ b/projects/kubernetes/common.rb @@ -1,4 +1,4 @@ -@image_name = "mobylinux/kubernetes" +@image_name = "linuxkit/kubernetes" @versions = { kubernetes: "v1.6.1", diff --git a/projects/kubernetes/image-cache/Dockerfile b/projects/kubernetes/image-cache/Dockerfile index ffde4331a..44210f632 100644 --- a/projects/kubernetes/image-cache/Dockerfile +++ b/projects/kubernetes/image-cache/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08 +FROM linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08 ADD . /images ENTRYPOINT [ "/bin/sh", "-c" ] CMD [ "for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ] diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index aa4e59d8b..dfc99896e 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -1,14 +1,14 @@ kernel: - image: "mobylinux/kernel:4.9.x" + image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 + - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 + - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b + - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" + image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" net: host pid: host ipc: host @@ -16,21 +16,21 @@ onboot: - CAP_SYS_ADMIN readonly: true - name: sysfs - image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c + image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c - name: binfmt image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692" binds: - /proc/sys/fs/binfmt_misc:/binfmt_misc readonly: true - name: format - image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e" + image: "linuxkit/format:53748000acf515549d398e6ae68545c26c0f3a2e" binds: - /dev:/dev capabilities: - CAP_SYS_ADMIN - CAP_MKNOD - name: mounts - image: "mobylinux/kubernetes:latest-mounts" + image: "linuxkit/kubernetes:latest-mounts" capabilities: - all pid: host @@ -40,13 +40,13 @@ onboot: - /var:/var:rshared,rbind services: - name: rngd - image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92" + image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314" capabilities: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" binds: - /var:/var - /tmp/etc:/etc @@ -57,7 +57,7 @@ services: net: host oomScoreAdj: -800 - name: ntpd - image: "mobylinux/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" + image: "linuxkit/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" capabilities: - CAP_SYS_TIME - CAP_SYS_NICE @@ -74,7 +74,7 @@ services: binds: - /root/.ssh:/root/.ssh - name: docker - image: "mobylinux/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" + image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" capabilities: - all net: host @@ -91,15 +91,15 @@ services: - /opt/cni:/opt/cni:rshared,rbind rootfsPropagation: shared - name: kubernetes-image-cache-common - image: "mobylinux/kubernetes:latest-image-cache-common" + image: "linuxkit/kubernetes:latest-image-cache-common" binds: - /var/run:/var/run - name: kubernetes-image-cache-control-plane - image: "mobylinux/kubernetes:latest-image-cache-control-plane" + image: "linuxkit/kubernetes:latest-image-cache-control-plane" binds: - /var/run:/var/run - name: kubelet - image: "mobylinux/kubernetes:latest" + image: "linuxkit/kubernetes:latest" capabilities: - all net: host diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index c31326728..e8367257a 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -1,14 +1,14 @@ kernel: - image: "mobylinux/kernel:4.9.x" + image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 + - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 + - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b + - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" + image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" net: host pid: host ipc: host @@ -16,21 +16,21 @@ onboot: - CAP_SYS_ADMIN readonly: true - name: sysfs - image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c + image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c - name: binfmt image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692" binds: - /proc/sys/fs/binfmt_misc:/binfmt_misc readonly: true - name: format - image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e" + image: "linuxkit/format:53748000acf515549d398e6ae68545c26c0f3a2e" binds: - /dev:/dev capabilities: - CAP_SYS_ADMIN - CAP_MKNOD - name: mounts - image: "mobylinux/kubernetes:latest-mounts" + image: "linuxkit/kubernetes:latest-mounts" capabilities: - all pid: host @@ -40,13 +40,13 @@ onboot: - /var:/var:rshared,rbind services: - name: rngd - image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92" + image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314" capabilities: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" binds: - /var:/var - /tmp/etc:/etc @@ -57,7 +57,7 @@ services: net: host oomScoreAdj: -800 - name: ntpd - image: "mobylinux/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" + image: "linuxkit/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" capabilities: - CAP_SYS_TIME - CAP_SYS_NICE @@ -74,7 +74,7 @@ services: binds: - /root/.ssh:/root/.ssh - name: docker - image: "mobylinux/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" + image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" capabilities: - all net: host @@ -91,11 +91,11 @@ services: - /opt/cni:/opt/cni:rshared,rbind rootfsPropagation: shared - name: kubernetes-image-cache-common - image: "mobylinux/kubernetes:latest-image-cache-common" + image: "linuxkit/kubernetes:latest-image-cache-common" binds: - /var/run:/var/run - name: kubelet - image: "mobylinux/kubernetes:latest" + image: "linuxkit/kubernetes:latest" capabilities: - all net: host diff --git a/projects/kubernetes/mounts.rb b/projects/kubernetes/mounts.rb index d07b996a7..a0f111086 100644 --- a/projects/kubernetes/mounts.rb +++ b/projects/kubernetes/mounts.rb @@ -1,6 +1,6 @@ import 'common.rb' -from "mobylinux/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" +from "linuxkit/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" script = [ mount_bind_hostns_self("/etc/cni"), mount_make_hostns_rshared("/etc/cni"),