diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..84da8d0 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + + - package-ecosystem: docker + directory: / + schedule: + interval: weekly diff --git a/.github/workflows/docker-ghcr.yml b/.github/workflows/docker-ghcr.yml index bccbe8b..21a80ad 100644 --- a/.github/workflows/docker-ghcr.yml +++ b/.github/workflows/docker-ghcr.yml @@ -55,29 +55,29 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push minimal - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: Dockerfile.minimal - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,riscv64,ppc64le push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.tags.outputs.minimal }} - name: Build and push busybox - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: Dockerfile.busybox - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,riscv64,ppc64le push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.tags.outputs.busybox }} - name: Build and push full - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: Dockerfile.full - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,riscv64,ppc64le push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.tags.outputs.full }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index da54520..6f9bd76 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -52,28 +52,28 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push minimal - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: Dockerfile.minimal - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,riscv64,ppc64le push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.tags.outputs.minimal }} - name: Build and push busybox - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: Dockerfile.busybox - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,riscv64,ppc64le push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.tags.outputs.busybox }} - name: Build and push full - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: Dockerfile.full - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,riscv64,ppc64le push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.tags.outputs.full }} diff --git a/README.md b/README.md index dc25a31..e7b5068 100644 --- a/README.md +++ b/README.md @@ -38,15 +38,14 @@ Full installation requires to mount /etc/3proxy directory with 3proxy.cfg files. to run: ``` -echo log >/path/to/local/config/directory/3proxy.cfg -echo nserver 8.8.8.8 >>/path/to/local/config/directory/3proxy.cfg -echo nscache 65536 >>/path/to/local/config/directory/3proxy.cfg -echo proxy -p3129 >>/path/to/local/config/directory/3proxy.cfg -docker run --read-only -p 3129:3129 -v /path/to/local/config/directory:/etc/3proxy --name 3proxy.full docker.io/3proxy/3proxy +echo " +log +nserver 8.8.8.8 +nscache 65536 +proxy -p3129" | docker config create 3proxy +docker run --read-only -p 3129:3129 --config source=3proxy,target=/etc/3proxy/3proxy.cfg --name 3proxy.full docker.io/3proxy/3proxy ``` - /path/to/local/config/directory in this example must contain 3proxy.cfg - use `log` without pathname in config to log to stdout. plugins are located in /usr/local/3proxy/libexec (/libexec for chroot config) and since 0.9.6 symlinked by /lib and /lib64 in both chroot and non-chroot configurations, so no full path is required in `plugin` command. Use e.g. `plugin SSLPlugin.ls.so ssl_plugin`. SSLPlugin is supported since 0.9.6. Some proxy types (e.g. SOCKSv5 UDPASSCOC, SOCKSv5 BIND functionality, ftp proxy) require access to ephemeral port, you may use e.g. -`-network host` mode or `-P` for `docker run`.