Browse Source

Update docker.yaml

kallydev 5 years ago
parent
commit
168675a61b
1 changed files with 35 additions and 13 deletions
  1. 35 13
      .github/workflows/docker.yaml

+ 35 - 13
.github/workflows/docker.yaml

@@ -1,4 +1,4 @@
-name: Release Docker image
+name: Release Docker Image
 
 
 on:
 on:
   push:
   push:
@@ -12,37 +12,59 @@ jobs:
       - name: Set up Checkout
       - name: Set up Checkout
         uses: actions/checkout@v2
         uses: actions/checkout@v2
 
 
-      - name: Set up Docker Buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
+      - name: Install Buildx and QEMU
+        run: |
+          export DOCKER_BUILDKIT=1
+          docker build --platform=local -o . git://github.com/docker/buildx
+          mkdir -p ~/.docker/cli-plugins
+          mv buildx ~/.docker/cli-plugins/docker-buildx
+          docker run --rm --privileged multiarch/qemu-user-static:latest --reset -p yes --credential yes
+          docker buildx create --use --name build --node build --driver-opt network=host
 
 
-      - name: Log in to DockerHub
+      - name: Log in to Docker Hub
         env:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
         run: |
           echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
           echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
 
 
-      - name: Get release version
-        id: get_relesase_version
+      - name: Get image version
+        id: get_image_version
         run: echo ::set-output name=version::${GITHUB_REF#refs/*/}
         run: echo ::set-output name=version::${GITHUB_REF#refs/*/}
 
 
-      - name: Build and puch Docker image (version)
+      - name: Get image name
+        id: get_image_name
         env:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          RELEASE_VERSION: ${{ steps.get_relesase_version.outputs.version }}
+        run: echo ::set-output name=name::$(echo $DOCKER_USERNAME | tr '[:upper:]' '[:lower:]')/v2fly-core
+
+      - name: Get image platform
+        env:
+          PLATFORM: linux/386,linux/amd64,linux/arm/v7,linux/arm64
+        id: get_image_platform
+        run: echo ::set-output name=platform::"$PLATFORM"
+
+      - name: Build and push Docker image (version)
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_IMAGE_NAME: ${{ steps.get_image_name.outputs.name }}
+          DOCKER_IMAGE_VERSION: ${{ steps.get_image_version.outputs.version }}
+          DOCKER_IMAGE_PLATFORM: ${{ steps.get_image_platform.outputs.platform }}
         run: |
         run: |
           docker buildx build \
           docker buildx build \
-            --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \
+            --platform "$DOCKER_IMAGE_PLATFORM" \
             --output "type=image,push=true" \
             --output "type=image,push=true" \
-            --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/v2fly-core:"$RELEASE_VERSION" \
+            --tag "$DOCKER_IMAGE_NAME":"$DOCKER_IMAGE_VERSION" \
             --file ./Dockerfile .
             --file ./Dockerfile .
-
+      
       - name: Build and push Docker image (latest)
       - name: Build and push Docker image (latest)
         env:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_IMAGE_NAME: ${{ steps.get_image_name.outputs.name }}
+          DOCKER_IMAGE_PLATFORM: ${{ steps.get_image_platform.outputs.platform }}
         run: |
         run: |
           docker buildx build \
           docker buildx build \
-            --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \
+            --platform "$DOCKER_IMAGE_PLATFORM" \
             --output "type=image,push=true" \
             --output "type=image,push=true" \
-            --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/v2fly-core:latest \
+            --tag "$DOCKER_IMAGE_NAME":latest \
             --file ./Dockerfile .
             --file ./Dockerfile .