Test desc

mayampi01 · Jul 24, 2024 · bb206e7 · bb206e7
1 parent 4be8d97
commit bb206e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
@@ -5,10 +5,10 @@ COPY . .
 ARG TARGETOS
 ARG TARGETARCH
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -o xray -trimpath -ldflags "-s -w -buildid=" ./main
-ADD https://github.com/v2fly/geoip/releases/latest/download/geoip.dat /v2fly/geoip.dat
-ADD https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat /v2fly/geosite.dat
-ADD https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat /loyalsoldier/geoip.dat
-ADD https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat /loyalsoldier/geosite.dat
+ADD https://github.com/v2fly/geoip/releases/latest/download/geoip.dat /V2Fly/geoip.dat
+ADD https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat /V2Fly/geosite.dat
+ADD https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat /Loyalsoldier/geoip.dat
+ADD https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat /Loyalsoldier/geosite.dat
 
 # chainguard/static contains only tzdata and ca-certificates, can be built with multiarch static binaries.
 FROM --platform=linux/amd64 chainguard/static:latest
@@ -24,5 +24,6 @@ ENV TZ=$TZ
 ENTRYPOINT [ "/usr/bin/xray" ]
 CMD [ "-config", "/etc/xray/config.json" ]
 
-ARG flavor=v2fly
+ARG flavor=V2Fly
 COPY --from=build /$flavor /usr/share/xray
+LABEL org.opencontainers.image.description Xray-core with $flavor geoip and geosite
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -25,7 +25,6 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
-          labels: org.opencontainers.image.description=Xray-core with V2Fly geoip and geosite
       - name: Docker metadata Loyalsoldier flavor
         id: loyalsoldier
         uses: docker/metadata-action@v5
@@ -39,7 +38,6 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
-          labels: org.opencontainers.image.description=Xray-core with Loyalsoldier geoip and geosite
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -66,6 +64,7 @@ jobs:
             linux/ppc64le
             linux/riscv64
             linux/s390x
+          provenance: false
           file: .github/docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -88,8 +87,9 @@ jobs:
             linux/ppc64le
             linux/riscv64
             linux/s390x
+          provenance: false
           file: .github/docker/Dockerfile
-          build-args: flavor=loyalsoldier
+          build-args: flavor=Loyalsoldier
           push: true
           tags: ${{ steps.loyalsoldier.outputs.tags }}
           labels: ${{ steps.loyalsoldier.outputs.labels }}