diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index f338ced..8b62f3a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,15 +13,14 @@ on: env: PATH: /opt/node/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin REGISTRY: registry.cn-chengdu.aliyuncs.com - IMAGE_NAME: bamanker/myk3stest + IMAGE_NAMESPPACE: bamanker + IMAGE_NAME: myk3stest APP_NAME: myk3s-test jobs: # 构建 Job build: runs-on: host - outputs: # 声明作业的输出变量,方便在其他 Job 引用 - datetime: ${{ steps.datetime.outputs.datetime }} steps: # 下载仓库源码,依赖java环境,因此构建服务器本地需要下载安装java并设置环境变量 - name: Checkout repository code @@ -44,7 +43,8 @@ jobs: env: APP_TAG: ${{ steps.get_version.outputs.version }} run: | - cat ./deployment.yml + cat ./deployment.yml | + export APP_TAG="${{ env.TAG }}" # export APP_TAG=$env.TAG # echo APP_TAG=${{ env.TAG }} | # export APP_NAME=${{ env.APP_NAME }} | @@ -81,7 +81,7 @@ jobs: platforms: linux/amd64 file: Dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPPACE }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} - name: k8s Check and Apply New Deployment diff --git a/deployment.yml b/deployment.yml index 99df05d..228f480 100644 --- a/deployment.yml +++ b/deployment.yml @@ -26,7 +26,7 @@ spec: version: $APP_TAG spec: containers: - - image: registry.cn-chengdu.aliyuncs.com/bamanker/myk3stest:$APP_TAG #$REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME + - image: $REGISTRY/$IMAGE_NAMESPACE/$IMAGE_NAME:$APP_TAG name: $APP_NAME imagePullPolicy: Always readinessProbe: