opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-31 01:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(build): update glance and torrent base image

Browse Source
This commit is contained in:
Zexi Li
2021-08-15 01:03:20 +08:00
parent 0b4a72d4e4
commit fe673fcb60
6 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/docker/Dockerfile.glance
+2 -2
View File
@@ -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 <lizexi@yunionyun.com>"
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
ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance
build/docker/Dockerfile.onecloud-base
+2 -1
View File
@@ -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 <lizexi@yunionyun.com>"
build/docker/Dockerfile.torrent
+7 -7
View File
@@ -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 <wanyaoqi@yunionyun.com>"
MAINTAINER "Zexi Li <zexi.li@icloud.com>"
# 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
build/docker/Makefile
+5
View File
@@ -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:
build/docker/multi-arch/Dockerfile.torrent
+9 -9
View File
@@ -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 <zexi.li@icloud.com>"
MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
# 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
build/docker/multi-arch/Dockerfile.torrent.dockerignore
+2
View File
@@ -0,0 +1,2 @@
_output/alpine-build/_cache