2ray #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

snakeshark21 wants to merge 104 commits into Akruidenberg:master from snakeshark21:master

.github/workflows/dnscrypt-proxy.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,36 +13,37 @@ jobs: @@
       build:
         runs-on: ubuntu-latest
         steps:
-          - uses: actions/checkout@v2
+          - name: Checkout
+            uses: actions/checkout@v2
           - name: Prepare
             id: prepare
             run: |
               VERSION=${{ github.event.client_payload.version }}
-              [[ ! -n $VERSION ]] && VERSION=2.0.42
-              DOCKER_PLATFORMS=linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x
-              echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
-                --tag gists/dnscrypt-proxy:latest \
-                --tag gists/dnscrypt-proxy:${VERSION} \
-                --file ./dnscrypt/proxy/Dockerfile \
-                ./dnscrypt/proxy
+              [[ ! -n $VERSION ]] && VERSION=2.0.45
+              IMAGE_NAME=dnscrypt-proxy
+              TAGS="gists/${IMAGE_NAME}:${VERSION},gists/${IMAGE_NAME}:latest"
+              echo ::set-output name=build_args::VERSION=${VERSION}
+              echo ::set-output name=image-name::${IMAGE_NAME}
+              echo ::set-output name=tags::${TAGS}
+          - name: Set up QEMU
+            uses: docker/setup-qemu-action@v1
           - name: Set up Docker Buildx
-            id: buildx
-            uses: crazy-max/ghaction-docker-buildx@v3
-          - name: Buildx (build)
-            run: |
-              docker buildx build \
-                --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
-          - name: Login to Docker Hub Registry
-            if: success()
-            env:
-              DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-              DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-            run: echo "${DOCKERHUB_PASSWORD}" | docker login --username "${DOCKERHUB_USERNAME}" --password-stdin
-          - name: Buildx (push)
-            if: success()
-            run: |
-              docker buildx build \
-                --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+            uses: docker/setup-buildx-action@v1
+          - name: Login to DockerHub
+            if: github.event_name != 'pull_request'
+            uses: docker/login-action@v1
+            with:
+              username: ${{ secrets.DOCKERHUB_USERNAME }}
+              password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          - name: Build
+            uses: docker/build-push-action@v2
+            with:
+              context: ./dnscrypt/proxy
+              file: ./dnscrypt/proxy/Dockerfile
+              platforms: linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x
+              push: ${{ github.event_name != 'pull_request' }}
+              build-args: ${{ steps.prepare.outputs.build_args }}
+              tags: ${{ steps.prepare.outputs.tags }}
           - name: Clear
             if: always()
             run: |
@@ Expand Down @@

.github/workflows/dnscrypt-wrapper.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,37 +13,37 @@ jobs:
  
      build:

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - name: Checkout

            uses: actions/checkout@v2

          - name: Prepare

            id: prepare

            run: |

              VERSION=${{ github.event.client_payload.version }}

              [[ ! -n $VERSION ]] && VERSION=0.4.2

              DOCKER_PLATFORMS=linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x

              echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \

                --build-arg VERSION=${VERSION} \

                --tag gists/dnscrypt-wrapper:latest \

                --tag gists/dnscrypt-wrapper:${VERSION} \

                --file ./dnscrypt/wrapper/Dockerfile \

                ./dnscrypt/wrapper

              IMAGE_NAME=dnscrypt-wrapper

              TAGS="gists/${IMAGE_NAME}:${VERSION},gists/${IMAGE_NAME}:latest"

              echo ::set-output name=build_args::VERSION=${VERSION}

              echo ::set-output name=image-name::${IMAGE_NAME}

              echo ::set-output name=tags::${TAGS}

          - name: Set up QEMU

            uses: docker/setup-qemu-action@v1

          - name: Set up Docker Buildx

            id: buildx

            uses: crazy-max/ghaction-docker-buildx@v3

          - name: Buildx (build)

            run: |

              docker buildx build \

                --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}

          - name: Login to Docker Hub Registry

            if: success()

            env:

              DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

              DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

            run: echo "${DOCKERHUB_PASSWORD}" | docker login --username "${DOCKERHUB_USERNAME}" --password-stdin

          - name: Buildx (push)

            if: success()

            run: |

              docker buildx build \

                --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}

            uses: docker/setup-buildx-action@v1

          - name: Login to DockerHub

            if: github.event_name != 'pull_request'

            uses: docker/login-action@v1

            with:

              username: ${{ secrets.DOCKERHUB_USERNAME }}

              password: ${{ secrets.DOCKERHUB_PASSWORD }}

          - name: Build

            uses: docker/build-push-action@v2

            with:

              context: ./dnscrypt/wrapper

              file: ./dnscrypt/wrapper/Dockerfile

              platforms: linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x

              push: ${{ github.event_name != 'pull_request' }}

              build-args: ${{ steps.prepare.outputs.build_args }}

              tags: ${{ steps.prepare.outputs.tags }}

          - name: Clear

            if: always()

            run: |

.github/workflows/dnsmasq.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,37 +13,37 @@ jobs:
  
      build:

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - name: Checkout

            uses: actions/checkout@v2

          - name: Prepare

            id: prepare

            run: |

              VERSION=${{ github.event.client_payload.version }}

              [[ ! -n $VERSION ]] && VERSION=2.81

              [[ ! -n $VERSION ]] && VERSION=2.84

              IMAGE_NAME=dnsmasq

              DOCKER_PLATFORMS=linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x

              echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \

                --tag gists/${IMAGE_NAME}:latest \

                --tag gists/${IMAGE_NAME}:${VERSION} \

                --file ./${IMAGE_NAME}/Dockerfile \

                ./${IMAGE_NAME}

              TAGS="gists/${IMAGE_NAME}:${VERSION},gists/${IMAGE_NAME}:latest"

              echo ::set-output name=build_args::VERSION=${VERSION}

              echo ::set-output name=image-name::${IMAGE_NAME}

              echo ::set-output name=tags::${TAGS}

          - name: Set up QEMU

            uses: docker/setup-qemu-action@v1

          - name: Set up Docker Buildx

            id: buildx

            uses: crazy-max/ghaction-docker-buildx@v3

          - name: Buildx (build)

            run: |

              docker buildx build \

                --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}

          - name: Login to Docker Hub Registry

            if: success()

            env:

              DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

              DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

            run: echo "${DOCKERHUB_PASSWORD}" | docker login --username "${DOCKERHUB_USERNAME}" --password-stdin

          - name: Buildx (push)

            if: success()

            run: |

              docker buildx build \

                --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}

            uses: docker/setup-buildx-action@v1

          - name: Login to DockerHub

            if: github.event_name != 'pull_request'

            uses: docker/login-action@v1

            with:

              username: ${{ secrets.DOCKERHUB_USERNAME }}

              password: ${{ secrets.DOCKERHUB_PASSWORD }}

          - name: Build

            uses: docker/build-push-action@v2

            with:

              context: ./${{ steps.prepare.outputs.image-name }}

              file: ./${{ steps.prepare.outputs.image-name }}/Dockerfile

              platforms: linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x

              push: ${{ github.event_name != 'pull_request' }}

              build-args: ${{ steps.prepare.outputs.build_args }}

              tags: ${{ steps.prepare.outputs.tags }}

          - name: Clear

            if: always()

            run: |

.github/workflows/docker-compose-bin.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,38 +13,37 @@ jobs: @@
       build:
         runs-on: ubuntu-latest
         steps:
-          - uses: actions/checkout@v2
+          - name: Checkout
+            uses: actions/checkout@v2
           - name: Prepare
             id: prepare
             run: |
               VERSION=${{ github.event.client_payload.version }}
-              [[ ! -n $VERSION ]] && VERSION=1.26.2
+              [[ ! -n $VERSION ]] && VERSION=1.28.2
               IMAGE_NAME=docker-compose-bin
-              DOCKER_PLATFORMS=linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
-              echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
-                --build-arg VERSION=${VERSION} \
-                --tag gists/${IMAGE_NAME}:latest \
-                --tag gists/${IMAGE_NAME}:${VERSION} \
-                --file ./${IMAGE_NAME}/Dockerfile \
-                ./${IMAGE_NAME}
+              TAGS="gists/${IMAGE_NAME}:${VERSION},gists/${IMAGE_NAME}:latest"
+              echo ::set-output name=build_args::VERSION=${VERSION}
+              echo ::set-output name=image-name::${IMAGE_NAME}
+              echo ::set-output name=tags::${TAGS}
+          - name: Set up QEMU
+            uses: docker/setup-qemu-action@v1
           - name: Set up Docker Buildx
-            id: buildx
-            uses: crazy-max/ghaction-docker-buildx@v3
-          - name: Buildx (build)
-            run: |
-              docker buildx build \
-                --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
-          - name: Login to Docker Hub Registry
-            if: success()
-            env:
-              DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-              DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-            run: echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
-          - name: Buildx (push)
-            if: success()
-            run: |
-              docker buildx build \
-                --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+            uses: docker/setup-buildx-action@v1
+          - name: Login to DockerHub
+            if: github.event_name != 'pull_request'
+            uses: docker/login-action@v1
+            with:
+              username: ${{ secrets.DOCKERHUB_USERNAME }}
+              password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          - name: Build
+            uses: docker/build-push-action@v2
+            with:
+              context: ./${{ steps.prepare.outputs.image-name }}
+              file: ./${{ steps.prepare.outputs.image-name }}/Dockerfile
+              platforms: linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+              push: ${{ github.event_name != 'pull_request' }}
+              build-args: ${{ steps.prepare.outputs.build_args }}
+              tags: ${{ steps.prepare.outputs.tags }}
           - name: Clear
             if: always()
             run: |
@@ Expand Down @@

.github/workflows/frp.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,38 +13,37 @@ jobs: @@
       build:
         runs-on: ubuntu-latest
         steps:
-          - uses: actions/checkout@v2
+          - name: Checkout
+            uses: actions/checkout@v2
           - name: Prepare
             id: prepare
             run: |
               VERSION=${{ github.event.client_payload.version }}
-              [[ ! -n $VERSION ]] && VERSION=0.33.0
+              [[ ! -n $VERSION ]] && VERSION=0.35.1
               IMAGE_NAME=frp
-              DOCKER_PLATFORMS=linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x
-              echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
-                --build-arg VERSION=${VERSION} \
-                --tag gists/${IMAGE_NAME}:latest \
-                --tag gists/${IMAGE_NAME}:${VERSION} \
-                --file ./${IMAGE_NAME}/Dockerfile \
-                ./${IMAGE_NAME}
+              TAGS="gists/${IMAGE_NAME}:${VERSION},gists/${IMAGE_NAME}:latest"
+              echo ::set-output name=build_args::VERSION=${VERSION}
+              echo ::set-output name=image-name::${IMAGE_NAME}
+              echo ::set-output name=tags::${TAGS}
+          - name: Set up QEMU
+            uses: docker/setup-qemu-action@v1
           - name: Set up Docker Buildx
-            id: buildx
-            uses: crazy-max/ghaction-docker-buildx@v3
-          - name: Buildx (build)
-            run: |
-              docker buildx build \
-                --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
-          - name: Login to Docker Hub Registry
-            if: success()
-            env:
-              DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-              DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-            run: echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
-          - name: Buildx (push)
-            if: success()
-            run: |
-              docker buildx build \
-                --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+            uses: docker/setup-buildx-action@v1
+          - name: Login to DockerHub
+            if: github.event_name != 'pull_request'
+            uses: docker/login-action@v1
+            with:
+              username: ${{ secrets.DOCKERHUB_USERNAME }}
+              password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          - name: Build
+            uses: docker/build-push-action@v2
+            with:
+              context: ./${{ steps.prepare.outputs.image-name }}
+              file: ./${{ steps.prepare.outputs.image-name }}/Dockerfile
+              platforms: linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x
+              push: ${{ github.event_name != 'pull_request' }}
+              build-args: ${{ steps.prepare.outputs.build_args }}
+              tags: ${{ steps.prepare.outputs.tags }}
           - name: Clear
             if: always()
             run: |
@@ Expand Down @@

.github/workflows/haproxy.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,37 +13,37 @@ jobs:
  
      build:

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - name: Checkout

            uses: actions/checkout@v2

          - name: Prepare

            id: prepare

            run: |

              VERSION=${{ github.event.client_payload.version }}

              [[ ! -n $VERSION ]] && VERSION=2.1.4

              [[ ! -n $VERSION ]] && VERSION=2.2.7

              IMAGE_NAME=haproxy

              DOCKER_PLATFORMS=linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x

              echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \

                --tag gists/${IMAGE_NAME}:latest \

                --tag gists/${IMAGE_NAME}:${VERSION} \

                --file ./${IMAGE_NAME}/Dockerfile \

                ./${IMAGE_NAME}

              TAGS="gists/${IMAGE_NAME}:${VERSION},gists/${IMAGE_NAME}:latest"

              echo ::set-output name=build_args::VERSION=${VERSION}

              echo ::set-output name=image-name::${IMAGE_NAME}

              echo ::set-output name=tags::${TAGS}

          - name: Set up QEMU

            uses: docker/setup-qemu-action@v1

          - name: Set up Docker Buildx

            id: buildx

            uses: crazy-max/ghaction-docker-buildx@v3

          - name: Buildx (build)

            run: |

              docker buildx build \

                --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}

          - name: Login to Docker Hub Registry

            if: success()

            env:

              DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

              DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

            run: echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin

          - name: Buildx (push)

            if: success()

            run: |

              docker buildx build \

                --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}

            uses: docker/setup-buildx-action@v1

          - name: Login to DockerHub

            if: github.event_name != 'pull_request'

            uses: docker/login-action@v1

            with:

              username: ${{ secrets.DOCKERHUB_USERNAME }}

              password: ${{ secrets.DOCKERHUB_PASSWORD }}

          - name: Build

            uses: docker/build-push-action@v2

            with:

              context: ./${{ steps.prepare.outputs.image-name }}

              file: ./${{ steps.prepare.outputs.image-name }}/Dockerfile

              platforms: linux/386,linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x

              push: ${{ github.event_name != 'pull_request' }}

              build-args: ${{ steps.prepare.outputs.build_args }}

              tags: ${{ steps.prepare.outputs.tags }}

          - name: Clear

            if: always()

            run: |

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2ray #1

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

2ray #1

Are you sure you want to change the base?

Uh oh!

2ray #1

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!