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

fix docker files

Browse Source
This commit is contained in:
wanyaoqi
2019-12-12 18:08:14 +08:00
parent 8671abbe53
commit 9f8be8de2a
10 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/docker.yml
+24 -1
View File
@@ -30,10 +30,13 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install librados-dev librbd-dev
make cmd/apigateway cmd/baremetal-agent cmd/climc cmd/keystone
make cmd/apigateway cmd/climc cmd/keystone
make cmd/logger cmd/region cmd/scheduler cmd/webconsole
make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway
make cmd/ansibleserver cmd/cloudnet cmd/notify
make cmd/host && ./scripts/bundle-libraries.sh _output/bin/bundles/host _output/bin/host
make cmd/host-deployer && ./scripts/bundle-libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
make cmd/baremetal-agent && ./scripts/bundle-libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
- name: Image baremetal-agent
uses: elgohr/Publish-Docker-Github-Action@master
@@ -154,3 +157,23 @@ jobs:
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.notify
- name: Image host
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/host
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.host
- name: Image host-deployer
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.host-deployer
build/docker/Dockerfile.baremetal-agent
+3 -10
View File
@@ -1,16 +1,9 @@
FROM frolvlad/alpine-glibc:glibc-2.28
FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:latest
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ Asia/Shanghai
RUN mkdir -p /opt/yunion/bin
RUN apk update && \
apk add --no-cache ipmitool ethtool tzdata && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent
build/docker/Dockerfile.baremetal-base
+29
View File
@@ -0,0 +1,29 @@
FROM frolvlad/alpine-glibc:glibc-2.28
MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
RUN mkdir -p /opt/yunion/bin
RUN apk update && \
apk add --no-cache ipmitool ethtool tzdata && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN mkdir -p /opt/cloud/yunion/baremetal
# download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
build/docker/Dockerfile.glance
+1 -11
View File
@@ -1,16 +1,6 @@
FROM centos:centos7
FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:latest
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ Asia/Shanghai
RUN yum install -y libaio
RUN rpm --import https://download.ceph.com/keys/release.asc
RUN yum install -y https://download.ceph.com/rpm-luminous/el7/noarch/ceph-release-1-1.el7.noarch.rpm
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
RUN yum install -y libcephfs-devel librbd-devel librados-devel
RUN yum install -y https://iso.yunion.cn/yumrepo-2.10/rpms/packages/yunion-qemu-2.12.1-2.12.1-1.el7.centos.x86_64.rpm https://iso.yunion.cn/yumrepo-2.10/rpms/packages/spice-0.13.3-1.el7.centos.x86_64.rpm
RUN mkdir -p /opt/yunion/bin
ADD ./_output/bin/glance /opt/yunion/bin/glance
ADD ./_output/bin/torrent /opt/yunion/bin/torrent
build/docker/Dockerfile.glance-base
+18
View File
@@ -0,0 +1,18 @@
FROM frolvlad/alpine-glibc:glibc-2.28
MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
RUN apk update && \
apk add --no-cache tzdata ca-certificates 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 && ./scripts/bundle-libraries.sh _output/bin/bundles/torrent _output/bin/torrent
RUN mkdir -p /opt/yunion/bin
ADD ./_output/bin/torrent /opt/yunion/bin/torrent
ADD ./_output/bin/.torrent.bin /opt/yunion/bin/.torrent.bin
ADD ./_output/bin/bundles/torrent /opt/yunion/bin/bundles/torrent
build/docker/Dockerfile.host
+1 -1
View File
@@ -1,4 +1,4 @@
FROM frolvlad/alpine-glibc:glibc-2.28
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
build/docker/Dockerfile.host-deployer
+1 -1
View File
@@ -1,4 +1,4 @@
FROM frolvlad/alpine-glibc:glibc-2.28
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
build/docker/Dockerfile.region
+1 -9
View File
@@ -1,15 +1,7 @@
FROM frolvlad/alpine-glibc:glibc-2.28
FROM registry.cn-beijing.aliyuncs.com/yunionio/region-base:latest
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
RUN apk update && \
apk add --no-cache tzdata ca-certificates && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ENV TZ Asia/Shanghai
RUN mkdir -p /opt/yunion/bin
COPY ./build/region/root/opt/ /opt/
build/docker/Dockerfile.region-base
+11
View File
@@ -0,0 +1,11 @@
FROM frolvlad/alpine-glibc:glibc-2.28
MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
RUN apk update && \
apk add --no-cache tzdata ca-certificates && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ENV TZ Asia/Shanghai
scripts/docker_push.sh
+1 -1
View File
@@ -38,7 +38,7 @@ build_bin() {
}
build_bundle_libraries() {
for bundle_component in 'host' 'host-deployer'; do
for bundle_component in 'host' 'host-deployer' 'baremetal-agent'; do
if [ $1 == $bundle_component ]; then
$CUR_DIR/bundle-libraries.sh _output/bin/bundles/$1 _output/bin/$1
break