diff --git a/build/docker/Dockerfile.glance b/build/docker/Dockerfile.glance index bdbe9e4eb7..dc506fe9a5 100644 --- a/build/docker/Dockerfile.glance +++ b/build/docker/Dockerfile.glance @@ -1,7 +1,7 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20200820 +FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0 MAINTAINER "Zexi Li " RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing RUN mkdir -p /opt/yunion/bin -ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance \ No newline at end of file +ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance diff --git a/build/docker/Dockerfile.onecloud-base b/build/docker/Dockerfile.onecloud-base index 06786ef1d1..21aec573f1 100644 --- a/build/docker/Dockerfile.onecloud-base +++ b/build/docker/Dockerfile.onecloud-base @@ -1,4 +1,5 @@ -FROM alpine:3.11 +# TODO: use 3.14 will lead 'apk add qemu-img fail on arm64' +FROM alpine:3.13.5 MAINTAINER "Zexi Li " diff --git a/build/docker/Dockerfile.torrent b/build/docker/Dockerfile.torrent index 68a9b39895..0c69009a22 100644 --- a/build/docker/Dockerfile.torrent +++ b/build/docker/Dockerfile.torrent @@ -1,15 +1,15 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -MAINTAINER "Yaoqi Wan " +MAINTAINER "Zexi Li " + +# HACK: use v3.14 alpine mirror to upgrade qemu-img +RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories +RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories RUN apk update && \ - apk add --no-cache tzdata ca-certificates qemu-img && \ + apk add --no-cache qemu-img && \ rm -rf /var/cache/apk/* -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -ENV TZ Asia/Shanghai - # add executable file torrent # make cmd/torrent RUN mkdir -p /opt/yunion/bin diff --git a/build/docker/Makefile b/build/docker/Makefile index c10c252bbf..fb6bb214a8 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -7,6 +7,11 @@ debian10-base: docker buildx build --platform linux/arm64,linux/amd64 --push \ -t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base . +ONECLOUD_BASE_VERSION = v0.3.5 + +onecloud-base: + $(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base . + CLIMC_BASE_VERSION = 20210701 climc-base: diff --git a/build/docker/multi-arch/Dockerfile.torrent b/build/docker/multi-arch/Dockerfile.torrent index 2e944799c3..25de595188 100644 --- a/build/docker/multi-arch/Dockerfile.torrent +++ b/build/docker/multi-arch/Dockerfile.torrent @@ -1,24 +1,24 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build ARG TARGETPLATFORM ARG BUILDPLATFORM + RUN mkdir -p /root/go/src/yunion.io/x/onecloud COPY . /root/go/src/yunion.io/x/onecloud +RUN cd /root/go/src/yunion.io/x/onecloud && make cmd/torrent -WORKDIR /root/go/src/yunion.io/x/onecloud -RUN make cmd/torrent +FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5 -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 +MAINTAINER "Zexi Li " -MAINTAINER "Yaoqi Wan " +# HACK: use v3.14 alpine mirror to upgrade qemu-img +RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories +RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories RUN apk update && \ - apk add --no-cache tzdata ca-certificates qemu-img && \ + apk add --no-cache qemu-img && \ rm -rf /var/cache/apk/* -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -ENV TZ Asia/Shanghai - +# TAG=20210815.0 # add executable file torrent # make cmd/torrent RUN mkdir -p /opt/yunion/bin diff --git a/build/docker/multi-arch/Dockerfile.torrent.dockerignore b/build/docker/multi-arch/Dockerfile.torrent.dockerignore new file mode 100644 index 0000000000..e2cb488007 --- /dev/null +++ b/build/docker/multi-arch/Dockerfile.torrent.dockerignore @@ -0,0 +1,2 @@ +_output/alpine-build/_cache +