diff --git a/.github/workflows/arch.push.yml b/.github/workflows/arch.push.yml index b63728f..c1285a8 100644 --- a/.github/workflows/arch.push.yml +++ b/.github/workflows/arch.push.yml @@ -59,10 +59,28 @@ jobs: push: true - name: Build and push arch 4 + uses: docker/build-push-action@v4 + with: + file: conf/arch.dockerfile + target: mp-alipay-ci + tags: ${{ env.REG_HOST }}/node-lts:mp-alipay-ci + platforms: linux/amd64 + push: true + + - name: Build and push arch 5 + uses: docker/build-push-action@v4 + with: + file: conf/arch.dockerfile + target: mp-wechat-ci + tags: ${{ env.REG_HOST }}/node-lts:mp-wechat-ci + platforms: ${{ env.platforms }} + push: true + + - name: Build and push arch 6 uses: docker/build-push-action@v4 with: file: conf/arch.dockerfile target: miniprogram-ci tags: ${{ env.REG_HOST }}/node-lts:miniprogram-ci - platforms: ${{ env.platforms }} + platforms: linux/amd64 push: true diff --git a/README.md b/README.md index d202a01..fbf8848 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ docker pull airkro/node-lts ### Size of node:tag -| Size | Tag | -| ----------------: | ---------- | -| ![alpine][alpine] | lts-alpine | -| ![slim][slim] | lts-slim | -| ![lts][lts] | lts | +| Size | Tag | +| ----------------: | --------------- | +| ![alpine][alpine] | node:lts-alpine | +| ![slim][slim] | node:lts-slim | +| ![lts][lts] | node:lts | [alpine]: https://img.shields.io/docker/image-size/_/node/lts-alpine?label=&style=flat-square [slim]: https://img.shields.io/docker/image-size/_/node/lts-slim?label=&style=flat-square @@ -32,14 +32,20 @@ docker pull airkro/node-lts ### Size of airkro/node-lts:tag -| Size | Tag | Features | -| ------------------: | :------ | :------------------------------------------- | -| ![latest][latest] | latest | git / zip | -| ![ssh][ssh] | ssh | git / zip / ssh | -| ![python3][python3] | python3 | git / zip / ssh / python3 | -| ![browser][browser] | browser | git / zip / ssh / playwright / Noto Sans ... | +| Size | Tag | Features | +| ----------------------------: | :----------- | :--------------------------------------------- | +| ![latest][latest] | latest | git / zip / docker-cli | +| ![ssh][ssh] | ssh | tag:latest / ssh | +| ![python3][python3] | python3 | tag:ssh / python3 | +| ![mp-wechat-ci][mp-wechat-ci] | mp-wechat-ci | tag:latest / npm:miniprogram-ci | +| ![mp-alipay-ci][mp-alipay-ci] | mp-alipay-ci | tag:python3 / npm:minidev | +| ![mp-ci][mp-ci] | mp-ci | tag:python3 / npm:miniprogram-ci / npm:minidev | +| ![browser][browser] | browser | git / zip / ssh / playwright / Noto Sans ... | [latest]: https://flat.badgen.net/docker/size/airkro/node-lts/latest?label= [ssh]: https://flat.badgen.net/docker/size/airkro/node-lts/ssh?label= [python3]: https://flat.badgen.net/docker/size/airkro/node-lts/python3?label= [browser]: https://flat.badgen.net/docker/size/airkro/node-lts/browser?label= +[mp-wechat-ci]: https://flat.badgen.net/docker/size/airkro/node-lts/mp-wechat-ci?label= +[mp-alipay-ci]: https://flat.badgen.net/docker/size/airkro/node-lts/mp-alipay-ci?label= +[mp-ci]: https://flat.badgen.net/docker/size/airkro/node-lts/mp-ci?label= diff --git a/conf/arch.dockerfile b/conf/arch.dockerfile index 71d85a8..f8635bd 100644 --- a/conf/arch.dockerfile +++ b/conf/arch.dockerfile @@ -8,5 +8,13 @@ RUN apk --no-cache --update add openssh FROM latest as python3 RUN apk --no-cache --update add python3 py3-pip -FROM latest as miniprogram-ci -RUN npm i -g miniprogram-ci minidev && rm -rf /root/.npm/_cacache && npm cache clean --force +FROM latest as mp-wechat-ci +RUN npm i -g miniprogram-ci && rm -rf /root/.npm/_cacache && npm cache clean --force + +FROM python3 as mp-alipay-ci +RUN apk --no-cache --update add make +RUN npm i -g minidev && rm -rf /root/.npm/_cacache && npm cache clean --force + +FROM python3 as mp-ci +RUN apk --no-cache --update add make +RUN npm i -g minidev miniprogram-ci && rm -rf /root/.npm/_cacache && npm cache clean --force diff --git a/conf/ci.dockerfile b/conf/ci.dockerfile index 69b77b8..35571ad 100644 --- a/conf/ci.dockerfile +++ b/conf/ci.dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.5 -FROM openjdk:11 as jdk11 +FROM openjdk:11 as qci_worker RUN <