diff --git a/.dockerignore b/.dockerignore index 0a0c6e9..d6c0773 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,6 @@ -.github -examples/ +* + +!cmd +!internal +!go.mod +!LICENSE diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e0871f9..520b554 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,10 +1,18 @@ # To get started with Dependabot version updates, you'll need to specify which # package ecosystems to update and where the package manifests are located. # Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference version: 2 updates: + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" - package-ecosystem: "gomod" # See documentation for possible values directory: "/" # Location of package manifests schedule: diff --git a/.github/workflows/docker-image-release.yaml b/.github/workflows/docker-image-release.yaml index 625e9c4..a00f34d 100644 --- a/.github/workflows/docker-image-release.yaml +++ b/.github/workflows/docker-image-release.yaml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Run Gosec Security Scanner uses: securego/gosec@master @@ -25,9 +25,9 @@ jobs: args: ./... - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: - go-version: '1.24.5' + go-version: '1.25' - name: Run Go tests run: go test ./... @@ -37,9 +37,9 @@ jobs: run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT" - name: Install Cosign - uses: sigstore/cosign-installer@v3.9.2 + uses: sigstore/cosign-installer@v3.10.0 with: - cosign-release: 'v2.5.3' + cosign-release: 'v2.6.0' - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -91,4 +91,4 @@ jobs: run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}@${{ steps.push-ghcr.outputs.digest }} env: COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} - COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} \ No newline at end of file + COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} diff --git a/.github/workflows/docker-image-testing.yaml b/.github/workflows/docker-image-testing.yaml index 7b71480..1ec57f8 100644 --- a/.github/workflows/docker-image-testing.yaml +++ b/.github/workflows/docker-image-testing.yaml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Run Gosec Security Scanner uses: securego/gosec@master @@ -26,17 +26,17 @@ jobs: args: ./... - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: - go-version: '1.24.5' + go-version: '1.25' - name: Run Go tests run: go test ./... # - name: Install Cosign -# uses: sigstore/cosign-installer@v3.9.2 +# uses: sigstore/cosign-installer@v3.10.0 # with: -# cosign-release: 'v2.5.3' +# cosign-release: 'v2.6.0' - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -69,7 +69,7 @@ jobs: ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }} # - name: Build and push Docker Hub image -# uses: docker/build-push-action@v5 +# uses: docker/build-push-action@v6 # id: push-dockerhub # with: # context: . @@ -87,7 +87,7 @@ jobs: # COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} # # - name: Build and push GHCR image -# uses: docker/build-push-action@v5 +# uses: docker/build-push-action@v6 # id: push-ghcr # with: # context: . @@ -102,4 +102,4 @@ jobs: # run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.push-ghcr.outputs.digest }} # env: # COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} -# COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} \ No newline at end of file +# COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} diff --git a/Dockerfile b/Dockerfile index 8449c24..78f3032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM --platform=$BUILDPLATFORM golang:1.25.0-alpine3.22 AS build +FROM --platform=$BUILDPLATFORM golang:1.25.1-alpine3.22 AS build WORKDIR /application COPY . ./ ARG TARGETOS diff --git a/examples/docker-compose/dozzle/compose.yaml b/examples/docker-compose/dozzle/compose.yaml index e2f9f82..29a041d 100644 --- a/examples/docker-compose/dozzle/compose.yaml +++ b/examples/docker-compose/dozzle/compose.yaml @@ -24,7 +24,7 @@ services: - docker-proxynet dozzle: - image: amir20/dozzle:v6.4.2 # make sure you use the most recent version + image: amir20/dozzle:v8.14 # make sure you use the most recent version user: 65534:65534 read_only: true mem_limit: 256M