diff --git a/Dockerfile.qemu b/Dockerfile.qemu index 2f6753140..1d36f6a9f 100644 --- a/Dockerfile.qemu +++ b/Dockerfile.qemu @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-qemu:1f3de121e9dea39a198413344a72049839bea91b +FROM mobylinux/alpine-qemu:804b2c40d078287c40aeb9166e475e843544e597 COPY alpine/initrd.img . COPY alpine/kernel/x86_64/vmlinuz64 . diff --git a/Dockerfile.qemuiso b/Dockerfile.qemuiso index 042612597..213b64ed3 100644 --- a/Dockerfile.qemuiso +++ b/Dockerfile.qemuiso @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-qemu:1f3de121e9dea39a198413344a72049839bea91b +FROM mobylinux/alpine-qemu:804b2c40d078287c40aeb9166e475e843544e597 COPY alpine/mobylinux-bios.iso . diff --git a/Dockerfile.test b/Dockerfile.test index a3e325cf8..58463ef8c 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-qemu:1f3de121e9dea39a198413344a72049839bea91b +FROM mobylinux/alpine-qemu:804b2c40d078287c40aeb9166e475e843544e597 COPY alpine/initrd.img . COPY alpine/kernel/x86_64/vmlinuz64 . diff --git a/alpine/Dockerfile b/alpine/Dockerfile index bbb56b640..9e6f39521 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-base:550f9068f98000a9134b08217cde767fa732e6e0 +FROM mobylinux/alpine-base:a789b97cc7b77b84fc341e1643b21b000823ee05 ENV ARCH=x86_64 diff --git a/alpine/Makefile b/alpine/Makefile index b1cbff5b4..ceed0df99 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -42,7 +42,7 @@ mobylinux-efi.iso: Dockerfile.efi initrd.img kernel/x86_64/vmlinuz64 mobylinux-bios.iso: initrd.img kernel/x86_64/vmlinuz64 tar cf - initrd.img -C kernel/x86_64 vmlinuz64 | \ - docker run --net=none --log-driver=none --rm -i mobylinux/alpine-bios:67236852ecf950af0486ac22b0963b404d16c348 >$@ + docker run --net=none --log-driver=none --rm -i mobylinux/alpine-bios:e6cb3f313db7098a1cd21051e678b01931a037a0 >$@ common: initrd.img $(MAKE) -C kernel diff --git a/alpine/base/alpine-base/Makefile b/alpine/base/alpine-base/Makefile index 7aad31eb5..9d8eb68e7 100644 --- a/alpine/base/alpine-base/Makefile +++ b/alpine/base/alpine-base/Makefile @@ -12,10 +12,8 @@ hash: push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):latest) + (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ + docker push mobylinux/$(IMAGE):$(shell cat hash)) docker run $(IMAGE):build cat /lib/apk/db/installed | grep -E '^(P|V)' | \ awk '/^P/{printf substr($$1, 3),$$0;next} /^V/{print " " substr($$1, 3);next}' | sort > packages docker rmi -f $(IMAGE):build @@ -23,8 +21,7 @@ push: hash tag: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)) + docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) docker rmi -f $(IMAGE):build rm -f hash diff --git a/alpine/base/alpine-base/packages b/alpine/base/alpine-base/packages index 765f7a22f..d62244286 100644 --- a/alpine/base/alpine-base/packages +++ b/alpine/base/alpine-base/packages @@ -1,9 +1,9 @@ alpine-baselayout 3.0.3-r0 -alpine-conf 3.4.1-r2 +alpine-conf 3.4.1-r5 alpine-keys 1.1-r0 apk-tools 2.6.7-r0 -bind-libs 9.10.4_p2-r0 -bind-tools 9.10.4_p2-r0 +bind-libs 9.10.4_p3-r0 +bind-tools 9.10.4_p3-r0 busybox 1.24.2-r11 busybox-initscripts 3.0-r3 ca-certificates 20160104-r4 diff --git a/alpine/base/alpine-bios/Makefile b/alpine/base/alpine-bios/Makefile index 8a628f621..1eefe51a2 100644 --- a/alpine/base/alpine-bios/Makefile +++ b/alpine/base/alpine-bios/Makefile @@ -12,17 +12,14 @@ hash: push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):latest) + (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ + docker push mobylinux/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash tag: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)) + docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) docker rmi $(IMAGE):build rm -f hash diff --git a/alpine/base/alpine-build-c/Makefile b/alpine/base/alpine-build-c/Makefile index 92f5cca6d..aec15ca21 100644 --- a/alpine/base/alpine-build-c/Makefile +++ b/alpine/base/alpine-build-c/Makefile @@ -12,17 +12,14 @@ hash: push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):latest) + (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ + docker push mobylinux/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash tag: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)) + docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) docker rmi $(IMAGE):build rm -f hash diff --git a/alpine/base/alpine-build-go/Makefile b/alpine/base/alpine-build-go/Makefile index c5f068d1e..5d74fe87c 100644 --- a/alpine/base/alpine-build-go/Makefile +++ b/alpine/base/alpine-build-go/Makefile @@ -12,17 +12,14 @@ hash: push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):latest) + (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ + docker push mobylinux/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash tag: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)) + docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) docker rmi $(IMAGE):build rm -f hash diff --git a/alpine/base/alpine-efi/Makefile b/alpine/base/alpine-efi/Makefile index 969296238..6e2d06fd0 100644 --- a/alpine/base/alpine-efi/Makefile +++ b/alpine/base/alpine-efi/Makefile @@ -12,17 +12,14 @@ hash: push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):latest) + (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ + docker push mobylinux/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash tag: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)) + docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) docker rmi $(IMAGE):build rm -f hash diff --git a/alpine/base/alpine-qemu/Makefile b/alpine/base/alpine-qemu/Makefile index fd9a07309..493388225 100644 --- a/alpine/base/alpine-qemu/Makefile +++ b/alpine/base/alpine-qemu/Makefile @@ -12,17 +12,14 @@ hash: push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):latest) + (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ + docker push mobylinux/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash tag: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)) + docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) docker rmi $(IMAGE):build rm -f hash diff --git a/alpine/packages/diagnostics/Dockerfile b/alpine/packages/diagnostics/Dockerfile index 3eea9dba5..1f4fc4954 100644 --- a/alpine/packages/diagnostics/Dockerfile +++ b/alpine/packages/diagnostics/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:21b413791b4fed2e16126c77c6b860feaf889d70 +FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc COPY ./ /go/src/diagnostics-server/ diff --git a/alpine/packages/proxy/Dockerfile b/alpine/packages/proxy/Dockerfile index cea1d15e2..8ab51cf72 100644 --- a/alpine/packages/proxy/Dockerfile +++ b/alpine/packages/proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:21b413791b4fed2e16126c77c6b860feaf889d70 +FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc COPY ./ /go/src/proxy/ diff --git a/alpine/packages/vsudd/Dockerfile b/alpine/packages/vsudd/Dockerfile index ce8227b3f..7a7ca6950 100644 --- a/alpine/packages/vsudd/Dockerfile +++ b/alpine/packages/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:21b413791b4fed2e16126c77c6b860feaf889d70 +FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc COPY ./ /go/src/vsudd/