diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 42839788c0..2129e2173a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -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 diff --git a/build/docker/Dockerfile.baremetal-agent b/build/docker/Dockerfile.baremetal-agent index c5e211a359..9434d8d619 100644 --- a/build/docker/Dockerfile.baremetal-agent +++ b/build/docker/Dockerfile.baremetal-agent @@ -1,16 +1,9 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 +FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:latest MAINTAINER "Zexi Li " -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 diff --git a/build/docker/Dockerfile.baremetal-base b/build/docker/Dockerfile.baremetal-base new file mode 100644 index 0000000000..6e8c38a8fa --- /dev/null +++ b/build/docker/Dockerfile.baremetal-base @@ -0,0 +1,29 @@ +FROM frolvlad/alpine-glibc:glibc-2.28 + +MAINTAINER "Yaoqi Wan " + +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 diff --git a/build/docker/Dockerfile.glance b/build/docker/Dockerfile.glance index c2cbf275a3..e2b25775b2 100644 --- a/build/docker/Dockerfile.glance +++ b/build/docker/Dockerfile.glance @@ -1,16 +1,6 @@ -FROM centos:centos7 +FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:latest MAINTAINER "Zexi Li " -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 diff --git a/build/docker/Dockerfile.glance-base b/build/docker/Dockerfile.glance-base new file mode 100644 index 0000000000..faba5db388 --- /dev/null +++ b/build/docker/Dockerfile.glance-base @@ -0,0 +1,18 @@ +FROM frolvlad/alpine-glibc:glibc-2.28 + +MAINTAINER "Yaoqi Wan " + +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 diff --git a/build/docker/Dockerfile.host b/build/docker/Dockerfile.host index f907180085..0c0590872a 100644 --- a/build/docker/Dockerfile.host +++ b/build/docker/Dockerfile.host @@ -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" diff --git a/build/docker/Dockerfile.host-deployer b/build/docker/Dockerfile.host-deployer index 7fb4127a07..d21d2ef78b 100644 --- a/build/docker/Dockerfile.host-deployer +++ b/build/docker/Dockerfile.host-deployer @@ -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" diff --git a/build/docker/Dockerfile.region b/build/docker/Dockerfile.region index a0da8b66cc..bc9adc542e 100644 --- a/build/docker/Dockerfile.region +++ b/build/docker/Dockerfile.region @@ -1,15 +1,7 @@ -FROM frolvlad/alpine-glibc:glibc-2.28 +FROM registry.cn-beijing.aliyuncs.com/yunionio/region-base:latest MAINTAINER "Zexi Li " -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/ diff --git a/build/docker/Dockerfile.region-base b/build/docker/Dockerfile.region-base new file mode 100644 index 0000000000..0e1f62fe07 --- /dev/null +++ b/build/docker/Dockerfile.region-base @@ -0,0 +1,11 @@ +FROM frolvlad/alpine-glibc:glibc-2.28 + +MAINTAINER "Yaoqi Wan " + +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 diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 2bd08403d4..9471d56a3f 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -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