X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=docker%2Fbuilder-include;fp=docker%2Fbuilder-include;h=fe88e9006736583a235d6261c20a69078628b895;hp=585be2656df636a49b03f08d629e65d73662e431;hb=8789ca2374c1f7fef21e393c81bc0f0dfddaacae;hpb=9cf2baa033bfc49dace2a20ba3df6f4cae7643e7 diff --git a/docker/builder-include b/docker/builder-include index 585be26..fe88e90 100644 --- a/docker/builder-include +++ b/docker/builder-include @@ -23,9 +23,9 @@ docker_from() { local a="$(arch)" case "${a}" in - amd64) echo "ubuntu:17.10" ;; - arm64) echo "arm64v8/ubuntu:17.10" ;; - ppc64le) echo "ppc64le/ubuntu:17.10" ;; + amd64) echo "ubuntu:18.04" ;; + arm64) echo "arm64v8/ubuntu:18.04" ;; + ppc64le) echo "ppc64le/ubuntu:18.04" ;; *) echo "${name}: ERROR: Unknown arch ${a}" >&2 exit 1 @@ -51,7 +51,7 @@ show_tag () { echo "${DOCKER_TAG}" } -: ${VERSION:="3"} +: ${VERSION:="4"} : ${ARCH_TAG:="$(arch_tag)"} : ${DOCKER_NAME:="pb-builder"} : ${DOCKER_TAG:="${DOCKER_NAME}:${VERSION}${ARCH_TAG}"}