Revert "Add docker workflow"

This reverts commit ce4902e5e6.

.github/workflows/docker.yaml

@@ -1,59 +0,0 @@
-name: Docker
-
-on:
-  push:
-    tags: [ 'v*.*.*' ]
-  workflow_dispatch:
-  
-env:
-  REGISTRY: docker.io
-  IMAGE_NAME: '{{ env.DOCKERHUB_ACCOUNT }}/{{ env.DOCKERHUB_REPO }}'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: |
-            linux/386
-            linux/amd64
-            linux/arm64/v8
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,41 +1,18 @@
 FROM golang:alpine as builder
 
-ARG TARGETOS
-ARG TARGETARCH
-
 RUN apk add --no-cache make git && \
-    mkdir /clash-config && \
+    wget -O /Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb
-    wget -O /clash-config/Country.mmdb https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb && \
-    wget -O /clash-config/geosite.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat && \
-    wget -O /clash-config/geoip.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
-
 WORKDIR /clash-src
+COPY --from=tonistiigi/xx:golang / /
 COPY . /clash-src
-RUN go mod download
+RUN go mod download && \
-RUN /bin/ash -c 'set -ex && \
+    make docker && \
-    if [ "$TARGETARCH" == "amd64" ]; then \
+    mv ./bin/clash-docker /clash
-       GOOS=$TARGETOS GOARCH=$TARGETARCH GOAMD64=v1 make docker && \
+
-       mv ./bin/Clash.Meta-docker ./bin/clash-amd64v1 && \
-       GOOS=$TARGETOS GOARCH=$TARGETARCH GOAMD64=v2 make docker && \
-       mv ./bin/Clash.Meta-docker ./bin/clash-amd64v2 && \
-       GOOS=$TARGETOS GOARCH=$TARGETARCH GOAMD64=v3 make docker && \
-       mv ./bin/Clash.Meta-docker ./bin/clash-amd64v3 && \
-       ln -s clash-amd64v3 ./bin/clash-amd64v4 && \
-       mv check_amd64.sh ./bin/ && \
-       printf "#!/bin/sh\\nsh ./check_amd64.sh\\nexec ./clash-amd64v\$? \$@" > ./bin/clash && \
-       chmod +x ./bin/check_amd64.sh ./bin/clash; \
-    else \
-       GOOS=$TARGETOS GOARCH=$TARGETARCH make docker && \
-       mv ./bin/Clash.Meta-docker ./bin/clash; \
-    fi'
 FROM alpine:latest
-LABEL org.opencontainers.image.source="https://github.com/MetaCubeX/Clash.Meta"
+LABEL org.opencontainers.image.source="https://github.com/Dreamacro/clash"
 
 RUN apk add --no-cache ca-certificates tzdata
-
+COPY --from=builder /Country.mmdb /root/.config/clash/
-VOLUME ["/root/.config/clash/"]
+COPY --from=builder /clash /
-EXPOSE 7890/tcp
-
-COPY --from=builder /clash-config/ /root/.config/clash/
-COPY --from=builder /clash-src/bin/ /
 ENTRYPOINT ["/clash"]

check_amd64.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-flags=$(grep '^flags\b' </proc/cpuinfo | head -n 1)
-flags=" ${flags#*:} "
-
-has_flags () {
-  for flag; do
-    case "$flags" in
-      *" $flag "*) :;;
-      *) return 1;;
-    esac
-  done
-}
-
-determine_level () {
-  level=0
-  has_flags lm cmov cx8 fpu fxsr mmx syscall sse2 || return 0
-  level=1
-  has_flags cx16 lahf_lm popcnt sse4_1 sse4_2 ssse3 || return 0
-  level=2
-  has_flags avx avx2 bmi1 bmi2 f16c fma abm movbe xsave || return 0
-  level=3
-  has_flags avx512f avx512bw avx512cd avx512dq avx512vl || return 0
-  level=4
-}
-
-determine_level
-echo "Your CPU supports amd64-v$level"
-return $level