X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=docker%2Fbuilder-include;h=7f56dc25ae500754c54a7e0f44a186ed97a18e95;hb=HEAD;hp=585be2656df636a49b03f08d629e65d73662e431;hpb=0462fd93ac1be3bfe3d3c9d1b118e9e8bff463cd;p=petitboot diff --git a/docker/builder-include b/docker/builder-include index 585be26..7f56dc2 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:="5"} : ${ARCH_TAG:="$(arch_tag)"} : ${DOCKER_NAME:="pb-builder"} : ${DOCKER_TAG:="${DOCKER_NAME}:${VERSION}${ARCH_TAG}"}