diff --git a/.github/workflows/docker-hub-description.yml b/.github/workflows/docker-hub-description.yml index 99e800b..252d6d8 100644 --- a/.github/workflows/docker-hub-description.yml +++ b/.github/workflows/docker-hub-description.yml @@ -4,18 +4,26 @@ on: push: tags: - '*' + workflow_call: + secrets: + DOCKERHUB_TOKEN: + required: true + +env: + DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} + DOCKERHUB_REPOSITORY: ${{ vars.DOCKERHUB_REPOSITORY }} jobs: update: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Update docker hub description - uses: peter-evans/dockerhub-description@v4 + uses: peter-evans/dockerhub-description@v5 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} + username: ${{ env.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - repository: visibilityspots/cloudflared + repository: ${{ github.repository_owner }}/${{ env.DOCKERHUB_REPOSITORY }} short-description: ${{ github.event.repository.description }} diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml deleted file mode 100644 index 7b4c64e..0000000 --- a/.github/workflows/main.yaml +++ /dev/null @@ -1,80 +0,0 @@ -name: CI - -on: - push: - tags: - - '*' - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Build Docker image - run: docker build -t visibilityspots/cloudflared:dev . - - - name: Install Goss - uses: e1himself/goss-installation-action@v1.2.1 - with: - version: 'v0.4.9' - - - name: Execute Goss tests - env: - GOSS_FILES_STRATEGY: cp - run: dgoss run visibilityspots/cloudflared:dev - - deploy: - needs: test - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Docker Login - uses: docker/login-action@v3.3.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - - - name: Build and push latest - uses: docker/build-push-action@v6 - with: - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 - push: true - tags: | - visibilityspots/cloudflared:latest - visibilityspots/cloudflared:${{ github.ref_name }} - cache-from: type=registry,ref=visibilityspots/cloudflared:buildcache - cache-to: type=registry,ref=visibilityspots/cloudflared:buildcache,mode=max - - - name: Update CHANGELOG - id: changelog - uses: requarks/changelog-action@v1 - with: - token: ${{ github.token }} - tag: ${{ github.ref_name }} - - - name: Create github release - uses: ncipollo/release-action@v1 - with: - makeLatest: true - allowUpdates: true - body: ${{ steps.changelog.output.changes }} - token: ${{ github.token }} - - - name: Commit CHANGELOG.md - uses: stefanzweifel/git-auto-commit-action@v5 - with: - branch: main - commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' - file_pattern: CHANGELOG.md diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..2e8b3b9 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,91 @@ +name: CI + +on: + push: + tags: + - '*' + workflow_call: + inputs: + platforms: + required: false + type: string + secrets: + DOCKERHUB_TOKEN: + required: true + GOSS_CMD: + required: false +env: + DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} + DOCKERHUB_REPOSITORY: ${{ vars.DOCKERHUB_REPOSITORY }} + DOCKERHUB_PLATFORMS: ${{ inputs.platforms || 'linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64' }} + +jobs: + test: + runs-on: ubuntu-24.04 + + steps: + - uses: actions/checkout@v6 + + - name: Build ${{ env.DOCKERHUB_REPOSITORY }}:dev image + run: docker build -t ${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:dev . + + - uses: e1himself/goss-installation-action@v1.3.0 + with: + version: 'v0.4.9' + + - name: Execute dgoss run on ${{ env.DOCKERHUB_REPOSITORY }}:dev image + env: + GOSS_FILES_STRATEGY: cp + run: dgoss run ${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:dev ${{ secrets.GOSS_CMD }} + + deploy: + needs: test + + runs-on: ubuntu-24.04 + + steps: + - uses: actions/checkout@v6 + + - uses: docker/login-action@v3.6.0 + with: + username: ${{ env.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - uses: docker/setup-qemu-action@v3 + + - uses: docker/setup-buildx-action@v3 + + - name: Build and push ${{ env.DOCKERHUB_REPOSITORY }} image + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile + platforms: ${{ env.DOCKERHUB_PLATFORMS }} + push: true + tags: | + ${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:latest + ${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:${{ github.ref_name }} + cache-from: type=registry,ref=${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:buildcache + cache-to: type=registry,ref=${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:buildcache,mode=max + + - name: Generate CHANGELOG + id: changelog + uses: requarks/changelog-action@v1 + with: + token: ${{ github.token }} + tag: ${{ github.ref_name }} + + - name: Create github ${{ github.ref_name }} release + uses: ncipollo/release-action@v1 + with: + makeLatest: true + allowUpdates: true + body: ${{ steps.changelog.output.changes }} + token: ${{ github.token }} + + - name: Commit updated CHANGELOG.md for ${{ github.ref_name }} + uses: stefanzweifel/git-auto-commit-action@v7 + with: + branch: main + commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' + file_pattern: CHANGELOG.md diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 53ced5e..23da1bb 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -6,43 +6,51 @@ on: - '*' schedule: - cron: '44 19 * * 4' + workflow_call: permissions: contents: read +env: + DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} + DOCKERHUB_REPOSITORY: ${{ vars.DOCKERHUB_REPOSITORY }} + TRIVY_DB_REPOSITORY: 'public.ecr.aws/aquasecurity/trivy-db' + TRIVY_JAVA_DB_REPOSITORY: 'public.ecr.aws/aquasecurity/trivy-java-db' + jobs: scan: permissions: contents: read security-events: write - runs-on: "ubuntu-latest" + + runs-on: ubuntu-24.04 + steps: - - name: Checkout code - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Build an image from Dockerfile run: | - docker build -t visibilityspots/cloudflared:dev . + docker build -t ${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:dev . - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.24.0 + uses: aquasecurity/trivy-action@0.33.1 with: - image-ref: 'visibilityspots/cloudflared:dev' + image-ref: '${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:dev' format: 'table' exit-code: 0 ignore-unfixed: true severity: 'CRITICAL,HIGH' - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.24.0 + - name: Store Trivy vulnerability scanner output + uses: aquasecurity/trivy-action@0.33.1 with: - image-ref: 'visibilityspots/cloudflared:dev' + image-ref: '${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPOSITORY }}:dev' format: 'sarif' output: 'trivy-results.sarif' ignore-unfixed: true severity: 'CRITICAL,HIGH' - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v3 + uses: github/codeql-action/upload-sarif@v4 with: sarif_file: 'trivy-results.sarif' diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e676e2..0280f8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,157 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [v2025.11.1] - 2025-11-07 +### :wrench: Chores +- [`e02f3ea`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/e02f3eaebf87d195ce2b802b4c379bb84c0b36db) - **update**: Cloudflared v2025.11.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.11.0] - 2025-11-07 +### :wrench: Chores +- [`adf0cdd`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/adf0cdd05cdb0b16fa03c303c989cc3ec3065d0d) - **update**: Cloudflared v2025.11.0 + golang v1.25.4 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.10.1] - 2025-10-31 +### :wrench: Chores +- [`4aebc4f`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/4aebc4fcfa401b445d0e5c301969c3091963575b) - **update**: Cloudflared v2025.10.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.10.0] - 2025-10-14 +### :wrench: Chores +- [`33d7f67`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/33d7f67effb9d6a204b1ec31afaea0b80a4ac970) - **update**: Cloudflared v2025.10.0 + golang v1.25.3 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.9.1] - 2025-09-23 +### :wrench: Chores +- [`8cd7526`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/8cd7526d309befbbb42f8e4ab0bb34dc6ee491e6) - **update**: Cloudflared v2025.9.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.9.0] - 2025-09-18 +### :wrench: Chores +- [`20f3f7e`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/20f3f7e42ae9622d76a79a80836fd2afdfee6360) - **update**: Cloudflared v2025.9.0 + golang v1.25.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.8.1] - 2025-08-22 +### :wrench: Chores +- [`bbdc6b1`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/bbdc6b1e2179a8df4cbb9b143353961efb9277a3) - **update**: Cloudflared v2025.8.1 + golang v1.25.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.8.0] - 2025-08-11 +### :wrench: Chores +- [`82860c2`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/82860c221bc1d4be33f15b68982f63564aeacaf2) - **update**: Cloudflared v2025.8.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.7.0] - 2025-07-03 +### :wrench: Chores +- [`deaaf1d`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/deaaf1d12c9ff6ed70e3802d6294ff5c42d614c6) - **update**: Cloudflared v2025.7.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.6.1] - 2025-06-17 +### :wrench: Chores +- [`1fa9b6e`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/1fa9b6ef67ab8f14cd4ff6f9b34309ff207cd90e) - **update**: Cloudflared v2025.6.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.6.0] - 2025-06-11 +### :wrench: Chores +- [`93a2a95`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/93a2a95ffcc5f79545a0457f2afedf22e28308e4) - **update**: Cloudflared v2025.6.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.5.0] - 2025-05-15 +### :wrench: Chores +- [`784a116`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/784a116c0505ec694a54c1bd288ed261b95a8147) - **update**: Cloudflared v2025.5.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.4.2] - 2025-04-30 +### :wrench: Chores +- [`0cc2e1e`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/0cc2e1e54188ddb6d4f12c84570aff9f3bb6d4b8) - **update**: Cloudflared v2025.4.2 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.4.0] - 2025-04-06 +### :wrench: Chores +- [`6839f99`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/6839f9910cc548eb83058bc43cec45c6b0d5e8fc) - **update**: Cloudflared v2025.4.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.2.1] - 2025-02-27 +### :wrench: Chores +- [`df22578`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/df22578a728da77e1399bf0cda10b88a609e228a) - **update**: chore(update): golang v1.24.0 + cloudflared v2025.2.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.2.0] - 2025-02-05 +### :wrench: Chores +- [`e97e76a`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/e97e76a4ace6d831fa58e138004e58b1bc1a8987) - **doc**: using udp port forwarding over net host mode in docker run commands *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`5d4b3b5`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/5d4b3b5faa539a2706bcfd81b7af0fb8aeb0bc54) - **update**: golang v1.23.6 + cloudflared v2025.2.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.1.1] - 2025-01-30 +### :wrench: Chores +- [`2a045a0`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/2a045a0396042712dd6a874697db27faa164a7a2) - **update**: Cloudflared v2025.1.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2025.1.0] - 2025-01-07 +### :wrench: Chores +- [`e77a264`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/e77a264c0e25679fbd9f7fd0eabfe47939c0854c) - **update**: Cloudflared v2025.1.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2024.12.2] - 2024-12-19 +### :wrench: Chores +- [`2c82345`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/2c82345f4c3a224549719af7264f1944f2717543) - **ci**: using ubuntu-24.04 for github action runners *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`8d621d5`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/8d621d57ddf75339bde40d930970742519d334f4) - **update**: Cloudflared v2024.12.2 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2024.12.1] - 2024-12-11 +### :wrench: Chores +- [`5ce16f6`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/5ce16f6492d93f23b49e5e81eafde8efedd32c9a) - **update**: Cloudflared v2024.12.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2024.12.0] - 2024-12-10 +### :sparkles: New Features +- [`3c1fce0`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/3c1fce03236cd9197c4b0adde0293724a663843d) - **ci**: introducing parameterized DOCKERHUB_PLATFORMS *(commit by [@visibilityspots](https://github.com/visibilityspots))* + +### :wrench: Chores +- [`396f777`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/396f7773c5a1e8d4829811ef607556d0ab6ac9c3) - **ci**: disable requirement on DOCKERHUB_TOKEN to test inheritance *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`a4132ca`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/a4132caa25d33213ae83633a04953d75f5053e4e) - **update**: Cloudflared v2024.12.0 + Golang v1.23.4 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2024.11.1] - 2024-11-19 +### :wrench: Chores +- [`13e7bb9`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/13e7bb9686da741b394ffd6b591e5b75ffbd999a) - **ci**: using secret for GOSS_CMD *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`efaa11d`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/efaa11d47f46b038a708d0ff3a71f17d961a14c5) - **update**: Cloudflared v2024.11.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2024.11.0] - 2024-11-08 +### :sparkles: New Features +- [`b2f7347`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/b2f7347c442194c83ed6db0103c66530e89a9c1d) - **ci**: adding reusable workflow parameters + refactored some of them *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`6a91e0d`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/6a91e0de3c03156c72a349ea5974557b19253325) - **ci**: make trivy workflow reusable *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`37a80e8`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/37a80e8432880ed7de135abb0ace0f56ac85452a) - **ci**: make main workflow reusable *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`f4a8d30`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/f4a8d30434d9b9b3ed013e6f7b1724a2dcd6459b) - **ci**: make GOSS_CMD vars param *(commit by [@visibilityspots](https://github.com/visibilityspots))* + +### :bug: Bug Fixes +- [`2eb1c3f`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/2eb1c3fd43921dea1ebbdc30a098fa3523290671) - **ci**: short-description indentation fixed *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`9a603da`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/9a603da8532ff99f533edd5b3d5fddf14b205ac0) - **ci**: using var for DOCKERHUB_USERNAME instead of default *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`53bea8d`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/53bea8d5d08c41235d6c2e53cc9333700b701dc1) - **ci**: using env var over inputs *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`edab8f3`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/edab8f31cfbd55a603089c6e8e9a98f57399b755) - **ci**: used wrong DOCKERHUB_REPOSITORY value due to copy paste *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`52d3450`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/52d34500edd9384105647adb273d70024e3bba49) - **README**: referring to yml main workflow over yaml one *(commit by [@visibilityspots](https://github.com/visibilityspots))* + +### :wrench: Chores +- [`a80a2cd`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/a80a2cd9044c9a3c33667a8cd9e3afcc6ef4f3b5) - **update**: Golang v1.23.3 + Cloudflared v2024.11.0 *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`fd2bdb7`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/fd2bdb75da3b9201fc81913fef8f082f0fa54586) - **ci**: trigger docker-hub-description on every push *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`efbfdab`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/efbfdab6784e531e748f57a4edfe54348a820b85) - **ci**: figuring out parameters *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`72aa91f`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/72aa91f316c3ab8ea27b42337f37898ebab8eeae) - **revert**: removed last release to test ci chain *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`a859394`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/a85939415eca220518bbb62524263934442e3b1e) - **ci**: refactored workflows *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`c709aa9`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/c709aa983149e06ea76a69c8515d96f57d436293) - **revert**: removed last release to test ci chain *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`dd577e7`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/dd577e75cad4ce45759d029e7739485e51a84318) - **ci**: standardized yml extension *(commit by [@visibilityspots](https://github.com/visibilityspots))* +- [`af0505a`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/af0505a9ecf510b6a023635b425d502f978258be) - **ci**: renamed a few actions + playing around with GOSS_CMD parameter *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + +## [v2024.10.1] - 2024-10-24 +### :bug: Bug Fixes +- [`c4bc296`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/c4bc29623a89a8e9ead3734f0d5291a66f20964f) - **ci**: using AWS based trivy repositories to mitigate TOOMANYREQUESTS from GHCR based ones *(commit by [@visibilityspots](https://github.com/visibilityspots))* + +### :wrench: Chores +- [`ad8eb0a`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/ad8eb0a2a050298a26d648f15e6b9198513546d4) - **update**: cloudflared v2024.10.1 *(commit by [@visibilityspots](https://github.com/visibilityspots))* + + ## [v2024.10.0] - 2024-10-10 ### :wrench: Chores - [`ea05d70`](https://github.com/visibilityspots/dockerfile-cloudflared/commit/ea05d70aff2c2dd429577aec4f6ad98cc46ae6bf) - **update**: cloudflared v2024.10.0 + golang v1.23.2 *(commit by [@visibilityspots](https://github.com/visibilityspots))* @@ -26,3 +177,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [v2024.8.3]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.8.2...v2024.8.3 [v2024.9.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.9.0...v2024.9.1 [v2024.10.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.9.1...v2024.10.0 +[v2024.10.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.10.0...v2024.10.1 +[v2024.11.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.10.1...v2024.11.0 +[v2024.11.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.10.1...v2024.11.0 +[v2024.11.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.10.1...v2024.11.0 +[v2024.11.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.10.1...v2024.11.0 +[v2024.11.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.11.0...v2024.11.1 +[v2024.12.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.11.1...v2024.12.0 +[v2024.12.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.12.0...v2024.12.1 +[v2024.12.2]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.12.1...v2024.12.2 +[v2025.1.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2024.12.2...v2025.1.0 +[v2025.1.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.1.0...v2025.1.1 +[v2025.2.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.1.1...v2025.2.0 +[v2025.2.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.2.0...v2025.2.1 +[v2025.4.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.2.1...v2025.4.0 +[v2025.4.2]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.4.0...v2025.4.2 +[v2025.5.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.4.2...v2025.5.0 +[v2025.6.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.5.0...v2025.6.0 +[v2025.6.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.6.0...v2025.6.1 +[v2025.7.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.6.1...v2025.7.0 +[v2025.8.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.7.0...v2025.8.0 +[v2025.8.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.8.0...v2025.8.1 +[v2025.9.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.8.1...v2025.9.0 +[v2025.9.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.9.0...v2025.9.1 +[v2025.10.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.9.1...v2025.10.0 +[v2025.10.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.10.0...v2025.10.1 +[v2025.11.0]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.10.1...v2025.11.0 +[v2025.11.1]: https://github.com/visibilityspots/dockerfile-cloudflared/compare/v2025.11.0...v2025.11.1 diff --git a/Dockerfile b/Dockerfile index 46d5a74..a2c9565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG GOLANG_VERSION=1.23.2 -ARG ALPINE_VERSION=3.20 -ARG UPSTREAM_RELEASE_TAG=2024.10.0 +ARG GOLANG_VERSION=1.25.4 +ARG ALPINE_VERSION=3.22 +ARG UPSTREAM_RELEASE_TAG=2025.11.1 FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} AS gobuild ARG GOLANG_VERSION diff --git a/README.md b/README.md index 0cb594d..a3df32d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![trivy](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/trivy.yml/badge.svg)](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/trivy.yml) [![docker-hub-description](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/docker-hub-description.yml/badge.svg)](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/docker-hub-description.yml) -[![build status](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/main.yaml/badge.svg)](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/main.yaml) +[![build status](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/main.yml/badge.svg)](https://github.com/visibilityspots/dockerfile-cloudflared/actions/workflows/main.yml) [![gitHub release](https://img.shields.io/github/v/release/visibilityspots/dockerfile-cloudflared)](https://github.com/visibilityspots/dockerfile-cloudflared/releases) [![docker image size](https://img.shields.io/docker/image-size/visibilityspots/cloudflared/latest)](https://hub.docker.com/r/visibilityspots/cloudflared) [![docker pulls](https://img.shields.io/docker/pulls/visibilityspots/cloudflared.svg)](https://hub.docker.com/r/visibilityspots/cloudflared/) @@ -10,7 +10,7 @@ [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fvisibilityspots%2Fdockerfile-cloudflared.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fvisibilityspots%2Fdockerfile-cloudflared?ref=badge_shield&issueType=license) a docker container which runs the [cloudflared](https://developers.cloudflare.com/1.1.1.1/dns-over-https/cloudflared-proxy/) proxy-dns at port 5054 based on alpine with some parameters to enable DNS over HTTPS proxy which can be used in combination with different DNS based adblocker; -* [pi-hole](https://pi-hole.net/) +* [pi-hole](https://pi-hole.net/) * [blocky](https://github.com/0xERR0R/blocky) * ... @@ -19,7 +19,7 @@ Originally based on tutorials from [Oliver Hough](https://oliverhough.cloud/blog ## run ``` -$ docker run --name cloudflared --rm --net host visibilityspots/cloudflared:latest +$ docker run --name cloudflared --rm -p 5054:5054/udp visibilityspots/cloudflared:latest ``` ### run with docker-compose @@ -31,25 +31,25 @@ $ docker-compose up ### custom upstream DNS service ``` -$ docker run --name cloudflared --rm --net host -e UPSTREAM1=https://dns.google/dns-query visibilityspots/cloudflared:latest +$ docker run --name cloudflared --rm -p 5054:5054/udp -e UPSTREAM1=https://dns.google/dns-query visibilityspots/cloudflared:latest ``` ### custom port ``` -$ docker run --name cloudflared --rm --net host -e PORT=5053 visibilityspots/cloudflared:latest +$ docker run --name cloudflared --rm -p 5053:5053/udp -e PORT=5053 visibilityspots/cloudflared:latest ``` ### dualstack ipv4/ipv6 ``` -$ docker run --name cloudflared --rm --net host -e ADDRESS=:: visibilityspots/cloudflared:latest +$ docker run --name cloudflared --rm -p 5054:5054/udp -e ADDRESS=:: visibilityspots/cloudflared:latest ``` ### limit connections to upstream dns servers ``` -$ docker run --name cloudflared --rm --net host -e MAX_UPSTREAM_CONNS=5 visibilityspots/cloudflared:latest +$ docker run --name cloudflared --rm -p 5054:5054/udp -e MAX_UPSTREAM_CONNS=5 visibilityspots/cloudflared:latest ``` ## test diff --git a/goss.yaml b/goss.yaml index 0075361..c45974f 100644 --- a/goss.yaml +++ b/goss.yaml @@ -17,7 +17,7 @@ command: cloudflared --version: exit-status: 0 stdout: - - cloudflared version 2024.10.0 (built October 2024) + - cloudflared version 2025.11.1 (built November 2025) dns: visibilityspots.org: