diff --git a/build/docker/Dockerfile.glance b/build/docker/Dockerfile.glance index a8aa52b452..b9d7e07dc2 100644 --- a/build/docker/Dockerfile.glance +++ b/build/docker/Dockerfile.glance @@ -1,8 +1,5 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0 +FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:v0.0.1 -MAINTAINER "Zexi Li " - -RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing ENV TZ UTC RUN mkdir -p /opt/yunion/bin ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance diff --git a/build/docker/Dockerfile.glance-base b/build/docker/Dockerfile.glance-base new file mode 100644 index 0000000000..f2e7d4b789 --- /dev/null +++ b/build/docker/Dockerfile.glance-base @@ -0,0 +1,5 @@ +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 diff --git a/build/docker/Makefile b/build/docker/Makefile index b1aa253d23..910c874eee 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -33,6 +33,14 @@ baremetal-base: $(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base . #docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION) +TORRENT_VERSION = 20210815.0 +torrent: + $(DOCKER_BUILDX)/torrent:$(TORRENT_VERSION) -f ./Dockerfile.torrent . + +GLANCE_BASE_VERSION = v0.0.1 +glance-base: + $(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base . + FILE_REPO_VERSION = v0.3.3 file-repo: