Compare commits
3 Commits
v1.2.0-RC1
...
v1.2.0-RC3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6bd02fba06 | ||
|
|
97e1214f68 | ||
|
|
6f590edfc5 |
20
.github/workflows/release.yml
vendored
20
.github/workflows/release.yml
vendored
@@ -7,15 +7,11 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
docker-image:
|
docker-image:
|
||||||
name: Build docker image
|
name: Build docker image
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v1 # Action page: <https://github.com/docker/setup-buildx-action>
|
|
||||||
id: buildx
|
|
||||||
|
|
||||||
- name: Docker login in default registry
|
- name: Docker login in default registry
|
||||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_LOGIN }}" --password-stdin &> /dev/null
|
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_LOGIN }}" --password-stdin &> /dev/null
|
||||||
|
|
||||||
@@ -28,11 +24,15 @@ jobs:
|
|||||||
|
|
||||||
- name: Build image
|
- name: Build image
|
||||||
run: |
|
run: |
|
||||||
docker buildx build \
|
docker build \
|
||||||
--platform ${{ steps.buildx.outputs.platforms }} \
|
--tag "tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
|
||||||
--tag "tarampampam/3proxy:${{ steps.tag.outputs.value }} \
|
|
||||||
--tag "tarampampam/3proxy:latest" \
|
--tag "tarampampam/3proxy:latest" \
|
||||||
--tag "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
|
--tag "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
|
||||||
--tag "ghcr.io/tarampampam/3proxy:latest" \
|
--tag "ghcr.io/tarampampam/3proxy:latest" \
|
||||||
--push \
|
-f ./Dockerfile .
|
||||||
.
|
|
||||||
|
- name: Push into default registry
|
||||||
|
run: docker push "tarampampam/3proxy:${{ steps.tag.outputs.value }}" && docker push "tarampampam/3proxy:latest"
|
||||||
|
|
||||||
|
- name: Push into ghcr.io
|
||||||
|
run: docker push "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" && docker push "ghcr.io/tarampampam/3proxy:latest"
|
||||||
|
|||||||
8
.github/workflows/tests.yml
vendored
8
.github/workflows/tests.yml
vendored
@@ -74,7 +74,7 @@ jobs: # Docs: <https://git.io/JvxXE>
|
|||||||
--proxy http://127.0.0.1:3128 \
|
--proxy http://127.0.0.1:3128 \
|
||||||
--connect-timeout 3 \
|
--connect-timeout 3 \
|
||||||
--max-time 3 \
|
--max-time 3 \
|
||||||
https://github.com/robots.txt
|
https://www.cloudflare.com/robots.txt
|
||||||
|
|
||||||
- name: Try to use SOCKS proxy
|
- name: Try to use SOCKS proxy
|
||||||
if: matrix.auth != 'yes'
|
if: matrix.auth != 'yes'
|
||||||
@@ -83,7 +83,7 @@ jobs: # Docs: <https://git.io/JvxXE>
|
|||||||
--proxy socks5://127.0.0.1:1080 \
|
--proxy socks5://127.0.0.1:1080 \
|
||||||
--connect-timeout 3 \
|
--connect-timeout 3 \
|
||||||
--max-time 3 \
|
--max-time 3 \
|
||||||
https://github.com/robots.txt
|
https://www.cloudflare.com/robots.txt
|
||||||
|
|
||||||
- name: Try to use HTTP proxy (with auth)
|
- name: Try to use HTTP proxy (with auth)
|
||||||
if: matrix.auth == 'yes'
|
if: matrix.auth == 'yes'
|
||||||
@@ -93,7 +93,7 @@ jobs: # Docs: <https://git.io/JvxXE>
|
|||||||
--proxy-user evil:live \
|
--proxy-user evil:live \
|
||||||
--connect-timeout 3 \
|
--connect-timeout 3 \
|
||||||
--max-time 3 \
|
--max-time 3 \
|
||||||
https://github.com/robots.txt
|
https://www.cloudflare.com/robots.txt
|
||||||
|
|
||||||
- name: Try to use SOCKS proxy (with auth)
|
- name: Try to use SOCKS proxy (with auth)
|
||||||
if: matrix.auth == 'yes'
|
if: matrix.auth == 'yes'
|
||||||
@@ -103,7 +103,7 @@ jobs: # Docs: <https://git.io/JvxXE>
|
|||||||
--proxy-user evil:live \
|
--proxy-user evil:live \
|
||||||
--connect-timeout 3 \
|
--connect-timeout 3 \
|
||||||
--max-time 3 \
|
--max-time 3 \
|
||||||
https://github.com/robots.txt
|
https://www.cloudflare.com/robots.txt
|
||||||
|
|
||||||
- name: Stop container
|
- name: Stop container
|
||||||
run: docker stop $(docker ps -a --filter ancestor=3proxy:local -q)
|
run: docker stop $(docker ps -a --filter ancestor=3proxy:local -q)
|
||||||
|
|||||||
@@ -58,6 +58,14 @@ $ docker run --rm -d \
|
|||||||
tarampampam/3proxy:latest
|
tarampampam/3proxy:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Releasing
|
||||||
|
|
||||||
|
New versions publishing is very simple - just make required changes in this repository, update [changelog file](CHANGELOG.md) and "publish" new release using repo releases page.
|
||||||
|
|
||||||
|
Docker images will be build and published automatically.
|
||||||
|
|
||||||
|
> New release will overwrite the `latest` docker image tag in both registers.
|
||||||
|
|
||||||
## Changes log
|
## Changes log
|
||||||
|
|
||||||
[![Release date][badge_release_date]][link_releases]
|
[![Release date][badge_release_date]][link_releases]
|
||||||
|
|||||||
Reference in New Issue
Block a user