This commit is contained in:
WJQSERVER 2024-10-11 10:45:15 +08:00
parent a21d5659ac
commit 6a1a1b3c8b

View file

@ -70,7 +70,6 @@ jobs:
needs: build needs: build
env: env:
IMAGE_NAME: wjqserver/ghproxy IMAGE_NAME: wjqserver/ghproxy
PROG_NAME: ghproxy
DOCKERFILE: docker/dockerfile/dev/Dockerfile DOCKERFILE: docker/dockerfile/dev/Dockerfile
DOCKERFILE_PATH: docker/dockerfile/dev DOCKERFILE_PATH: docker/dockerfile/dev
@ -92,14 +91,11 @@ jobs:
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to Docker Hub - name: Login to Docker Hub
uses: docker/login-action@v3 run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build Docker image - name: Build Docker image
run: | run: |
docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.PROG_NAME }}:dev --tag ${{ env.PROG_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} ./${{ env.DOCKERFILE_PATH }} docker buildx build --platform linux/amd64,linux/arm64 --tag ${{ env.IMAGE_NAME }}:dev --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} -f ./${{ env.DOCKERFILE }} ./${{ env.DOCKERFILE_PATH }}
- name: Install Slim - name: Install Slim
run: | run: |
@ -116,7 +112,5 @@ jobs:
- name: Push Docker image - name: Push Docker image
run: | run: |
docker tag ${{ env.PROG_NAME }}:${{ env.VERSION }} ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
docker tag ${{ env.PROG_NAME }}:dev ${{ env.IMAGE_NAME }}:dev
docker push ${{ env.IMAGE_NAME }}:${{ env.VERSION }} docker push ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
docker push ${{ env.IMAGE_NAME }}:dev docker push ${{ env.IMAGE_NAME }}:dev