Update CHANGELOG.md

Bumps gcc from 10.2.0 to 10.3.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/release.yml

@@ -7,15 +7,11 @@ on:
 jobs:
   docker-image:
     name: Build docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
         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
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_LOGIN }}" --password-stdin &> /dev/null
 
@@ -28,11 +24,15 @@ jobs:
 
       - name: Build image
         run: |
-          docker buildx build \
-            --platform ${{ steps.buildx.outputs.platforms }} \
-            --tag "tarampampam/3proxy:${{ steps.tag.outputs.value }} \
+          docker build \
+            --tag "tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
             --tag "tarampampam/3proxy:latest" \
             --tag "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
             --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"

.github/workflows/tests.yml

@@ -7,8 +7,6 @@ on:
     tags-ignore:
       - '**'
   pull_request:
-  schedule:
-    - cron: '0 0 * * 0' # once in a week, docs: <https://git.io/JvxXE#onschedule>
 
 jobs: # Docs: <https://git.io/JvxXE>
   build-image:
@@ -74,7 +72,7 @@ jobs: # Docs: <https://git.io/JvxXE>
             --proxy http://127.0.0.1:3128 \
             --connect-timeout 3 \
             --max-time 3 \
-            https://github.com/robots.txt
+            https://www.cloudflare.com/robots.txt
 
       - name: Try to use SOCKS proxy
         if: matrix.auth != 'yes'
@@ -83,7 +81,7 @@ jobs: # Docs: <https://git.io/JvxXE>
             --proxy socks5://127.0.0.1:1080 \
             --connect-timeout 3 \
             --max-time 3 \
-            https://github.com/robots.txt
+            https://www.cloudflare.com/robots.txt
 
       - name: Try to use HTTP proxy (with auth)
         if: matrix.auth == 'yes'
@@ -93,7 +91,7 @@ jobs: # Docs: <https://git.io/JvxXE>
             --proxy-user evil:live \
             --connect-timeout 3 \
             --max-time 3 \
-            https://github.com/robots.txt
+            https://www.cloudflare.com/robots.txt
 
       - name: Try to use SOCKS proxy (with auth)
         if: matrix.auth == 'yes'
@@ -103,7 +101,7 @@ jobs: # Docs: <https://git.io/JvxXE>
             --proxy-user evil:live \
             --connect-timeout 3 \
             --max-time 3 \
-            https://github.com/robots.txt
+            https://www.cloudflare.com/robots.txt
 
       - name: Stop container
         run: docker stop $(docker ps -a --filter ancestor=3proxy:local -q)

3proxy.cfg

@@ -16,8 +16,9 @@ nscache 65536
 # Here we can change timeout values
 timeouts 1 5 30 60 180 1800 15 60
 
+# Logging docs: <https://3proxy.org/doc/howtor.html#LOGFORMAT>
 log /dev/stdout
-logformat "- +_L%t.%.  %N.%p %E %U %C:%c %R:%r %O %I %h %T"
+logformat "-\""+_G{""time_unix"":%t, ""proxy"":{""type:"":""%N"", ""port"":%p}, ""error"":{""code"":""%E""}, ""auth"":{""user"":""%U""}, ""client"":{""ip"":""%C"", ""port"":%c}, ""server"":{""ip"":""%R"", ""port"":%r}, ""bytes"":{""sent"":%O, ""received"":%I}, ""request"":{""hostname"":""%n""}, ""message"":""%T""}"
 
 maxconn 1024
 

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this package will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
+## v1.4.0
+
+### Changed
+
+- 3proxy updated from `0.9.3` up to `0.9.4`
+
+## v1.3.0
+
+### Changed
+
+- Logging in JSON format
+
 ## v1.2.0
 
 ### Changed

Dockerfile

@@ -1,8 +1,8 @@
-# Image page: <https://hub.docker.com/_/alpine>
-FROM gcc:9.3 as builder
+# Image page: <https://hub.docker.com/_/gcc>
+FROM gcc:11.1.0 as builder
 
-# e.g.: `docker build --build-arg "VERSION=0.9.3" .`
-ARG VERSION="0.9.3"
+# e.g.: `docker build --build-arg "VERSION=0.9.4" .`
+ARG VERSION="0.9.4"
 
 # Fetch 3proxy sources
 RUN set -x \
@@ -34,7 +34,7 @@ RUN set -x \
     && strip ./bin/SSLPlugin.ld.so
 
 # Prepare filesystem for 3proxy running
-FROM busybox:1.32-glibc as buffer
+FROM busybox:1.33.1-glibc as buffer
 
 # Copy binaries
 COPY --from=builder /lib/x86_64-linux-gnu/libdl.so.* /lib/

README.md

@@ -12,7 +12,7 @@
 
 ## Why this image created?
 
-3proxy is awesome and lightweight proxy-server. This image contains stable version with it and can be configured using environment variables. By default, it uses anonymous (information about client hiding) proxy settings.
+3proxy is awesome and lightweight proxy-server. This image contains stable version with it and can be configured using environment variables. By default, it uses anonymous (information about client hiding) proxy settings. Logging in JSON format.
 
 > Page on `hub.docker.com` can be [found here][link_docker_hub].
 
@@ -58,6 +58,14 @@ $ docker run --rm -d \
     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
 
 [![Release date][badge_release_date]][link_releases]