File tree Expand file tree Collapse file tree 3 files changed +12
-33
lines changed
acme.sh/.github/workflows
kubernetes/.github/workflows Expand file tree Collapse file tree 3 files changed +12
-33
lines changed Original file line number Diff line number Diff line change 2323 login-server : ghcr.io
2424 username : khs1994
2525 password : ${{ secrets.GHCR_IO_TOKEN }}
26+ - uses : azure/docker-login@v1
27+ with :
28+ login-server : docker.cnb.cool
29+ username : cnb
30+ password : ${{ secrets.CODING_DOCKER_PASSWORD }}
2631 - run : |
2732 export GITHUB_TAG=$(echo $GITHUB_REF | cut -d '/' -f 3)
2833
3540 -t ${REGISTRY_MIRROR}/${DOCKER_IMAGE}:${GITHUB_TAG} \
3641 -t ${DOCKER_IMAGE}:alpine \
3742 -t ${REGISTRY_MIRROR}/${DOCKER_IMAGE}:alpine \
43+ -t docker.cnb.cool/khs1994-docker/lrew/acme:${GITHUB_TAG} \
44+ -t docker.cnb.cool/khs1994-docker/lrew/acme:alpine \
45+ -t docker.cnb.cool/khs1994-docker/khs1994/acme:${GITHUB_TAG} \
46+ -t docker.cnb.cool/khs1994-docker/khs1994/acme:alpine \
3847 "
3948 DOCKER_PUSH="--push"
4049 DOCKER_LATEST_TAG="latest"
Original file line number Diff line number Diff line change @@ -221,6 +221,7 @@ jobs:
221221 id: build
222222 # continue-on-error: ${{ matrix.TYPE == 'swoole' }}
223223 continue-on-error: true
224+ - run : docker pull snyk/snyk:docker
224225 - name : Run Snyk to check Docker image for vulnerabilities
225226 # Snyk can be used to break the build when it detects vulnerabilities.
226227 # In this case we want to upload the issues to GitHub Code Scanning
Original file line number Diff line number Diff line change @@ -48,13 +48,13 @@ jobs:
4848 # next version
4949 - os : ubuntu
5050 dist : 22.04
51- CI_KUBERNETES_VERSION : 1.34.0-alpha.2
51+ CI_KUBERNETES_VERSION : 1.34.0-rc.0
5252 LNMP_K8S_GET : --url
5353 GENERATE_CLI_HELP : " true"
5454 LNMP_K8S_NEXT_VERSION : " true"
5555 - os : ubuntu
5656 dist : 22.04-arm
57- CI_KUBERNETES_VERSION : 1.34.0-alpha.2
57+ CI_KUBERNETES_VERSION : 1.34.0-rc.0
5858 LNMP_K8S_GET : --url
5959 # GENERATE_CLI_HELP: "true"
6060
@@ -570,37 +570,6 @@ jobs:
570570 && git push origin $(git branch --show-current):v${CI_KUBERNETES_VERSION}-config -f \
571571 || true
572572
573- - name : Update k8s next next cli help info
574- run :
575- |
576- export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH
577- BASE_BRANCH=v1.28.0-alpha.1
578- BASE_BRANCH=master
579- if [ $CI_KUBERNETES_VERSION != 'x.y.z-alpha.1' ];then
580- exit 0
581- fi
582-
583- set -x
584- cd /tmp
585- rm -rf lnmp-k8s
586- git clone -b ${BASE_BRANCH} --depth=3 https://khs1994:${GITHUB_TOKEN}@github.com/khs1994-docker/lnmp-k8s \
587- || git clone -b master --depth=3 https://khs1994:${GITHUB_TOKEN}@github.com/khs1994-docker/lnmp-k8s
588- cd lnmp-k8s
589-
590- stty size || true
591- stty cols 200 || true
592-
593- # sudo sed -i "s#^LNMP_CN_ENV=.*#LNMP_CN_ENV=true#g" ./.env
594- cd cli ; (COLUMNS=200 sh generate.sh || true); cd ..
595-
596- git add .
597- git commit -m "Update v$CI_KUBERNETES_VERSION config" -s \
598- && git push origin $(git branch --show-current):v${CI_KUBERNETES_VERSION}-config -f \
599- || true
600-
601-
602-
603-
604573 # - name: Setup tmate session
605574 # uses: mxschmitt/action-tmate@v3
606575 # if: ${{ failure() }}
You can’t perform that action at this time.
0 commit comments