X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=docker%2Fbuilder-include;h=fe88e9006736583a235d6261c20a69078628b895;hp=4f42e2c6e7bbc458d701d2c95310631a32ba3c7d;hb=8789ca2374c1f7fef21e393c81bc0f0dfddaacae;hpb=1a6bbc3061b0838454d0b849d244775f43e5fcc3 diff --git a/docker/builder-include b/docker/builder-include index 4f42e2c..fe88e90 100644 --- a/docker/builder-include +++ b/docker/builder-include @@ -23,8 +23,9 @@ docker_from() { local a="$(arch)" case "${a}" in - amd64) echo "ubuntu:17.10" ;; - arm64) echo "arm64v8/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 @@ -50,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}"}