From 86040853ba571e49b96049790e0d4a45cad09224 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Wed, 18 Oct 2023 14:33:51 +0200 Subject: [PATCH 01/25] added .gitignore --- .gitignore | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0299eae --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +# Mac/OSX +.DS_Store + +# VIM +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +*~ +# Persistent undo +[._]*.un~ From e91dd341475c94a98e857eafeba097e481ac2eb8 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Wed, 18 Oct 2023 14:34:43 +0200 Subject: [PATCH 02/25] added failover support --- 01proxy | 2 ++ README.md | 8 ++++++++ apt-proxy-detect.sh | 10 ++++++++++ 3 files changed, 20 insertions(+) create mode 100644 01proxy create mode 100755 apt-proxy-detect.sh diff --git a/01proxy b/01proxy new file mode 100644 index 0000000..d076432 --- /dev/null +++ b/01proxy @@ -0,0 +1,2 @@ +Acquire::HTTP::Proxy-Auto-Detect "/usr/local/bin/apt-proxy-detect.sh"; +Acquire::HTTPS::Proxy "false"; diff --git a/README.md b/README.md index e47dda2..9c7ed54 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,14 @@ Acquire::HTTP::Proxy "http://172.17.0.1:3142"; Acquire::HTTPS::Proxy "false"; ``` +If you are using a Laptop that is not always able to reach the container +you want it to be able to bypass the proxy if it cant reach it +use the these files 2 files +``` +cp 01proxy /etc/apt/apt.conf.d/ +cp apt-proxy-detect.sh /usr/local/bin/ +``` + Similarly, to use Apt-Cacher NG in you Docker containers add the following line to your `Dockerfile` before any `apt-get` commands. ```dockerfile diff --git a/apt-proxy-detect.sh b/apt-proxy-detect.sh new file mode 100755 index 0000000..e43dd72 --- /dev/null +++ b/apt-proxy-detect.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +IP=172.17.0.1 +PORT=3142 +if nc -w1 -z $IP $PORT 2> /dev/null +then + echo -n "http://${IP}:${PORT}" +else + echo -n "DIRECT" +fi From e8e530819f82d7ac6d649c818e483b57ed07401b Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Wed, 18 Oct 2023 15:05:02 +0200 Subject: [PATCH 03/25] better description --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9c7ed54..9de2375 100644 --- a/README.md +++ b/README.md @@ -136,9 +136,8 @@ Acquire::HTTP::Proxy "http://172.17.0.1:3142"; Acquire::HTTPS::Proxy "false"; ``` -If you are using a Laptop that is not always able to reach the container -you want it to be able to bypass the proxy if it cant reach it -use the these files 2 files +If you are using a Laptop that is not always able to reach apt-proxy-ng +in order to be able to bypass the proxy, use the these 2 files ``` cp 01proxy /etc/apt/apt.conf.d/ cp apt-proxy-detect.sh /usr/local/bin/ From 2e1e5e85033d793ffbb98a7971de03a22854d470 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:29:30 +0200 Subject: [PATCH 04/25] moved config to sub dir --- 01proxy => docker/01proxy | 0 apt-proxy-detect.sh => docker/apt-proxy-detect.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename 01proxy => docker/01proxy (100%) rename apt-proxy-detect.sh => docker/apt-proxy-detect.sh (100%) diff --git a/01proxy b/docker/01proxy similarity index 100% rename from 01proxy rename to docker/01proxy diff --git a/apt-proxy-detect.sh b/docker/apt-proxy-detect.sh similarity index 100% rename from apt-proxy-detect.sh rename to docker/apt-proxy-detect.sh From a2f8c74d4feafa37b3bf97ed5a07862bfe8587f3 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:34:39 +0200 Subject: [PATCH 05/25] sample files --- docker/Dockerfile | 8 ++++++++ docker/compose.yaml | 9 +++++++++ docker/run-bash.sh | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 docker/Dockerfile create mode 100644 docker/compose.yaml create mode 100644 docker/run-bash.sh diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..1285adf --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,8 @@ +FROM ubuntu:latest + +COPY 01proxy /etc/apt/apt.conf.d/ +COPY apt-proxy-detect.sh /usr/local/bin/ + +RUN apt-get update && \ + apt-get install -y netcat && \ + apt-get upgrade -y diff --git a/docker/compose.yaml b/docker/compose.yaml new file mode 100644 index 0000000..9b65aa9 --- /dev/null +++ b/docker/compose.yaml @@ -0,0 +1,9 @@ +version: '3.5' + +services: + my_server: + image: exsample/my_server + build: . + environment: + APT_CACHER_NG_IP: '172.17.0.1' + APT_CACHER_NG_PORT: '3142' diff --git a/docker/run-bash.sh b/docker/run-bash.sh new file mode 100644 index 0000000..b10f5ac --- /dev/null +++ b/docker/run-bash.sh @@ -0,0 +1,2 @@ +docker run -e APT_CACHER_NG_IP=172.17.0.1 -e APT_CACHER_NG_PORT=3142 -it exsample/my_server /bin/bash + From 1dd658f0a9791018d50ef6a065d389abd8e8e873 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:35:36 +0200 Subject: [PATCH 06/25] changed to use ENV vars --- docker/apt-proxy-detect.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/docker/apt-proxy-detect.sh b/docker/apt-proxy-detect.sh index e43dd72..c0b45e6 100755 --- a/docker/apt-proxy-detect.sh +++ b/docker/apt-proxy-detect.sh @@ -1,10 +1,21 @@ #!/bin/bash -IP=172.17.0.1 -PORT=3142 -if nc -w1 -z $IP $PORT 2> /dev/null +if [ -z $APT_CACHER_NG_IP ] then - echo -n "http://${IP}:${PORT}" + echo -n "DIRECT" + exit +fi + +if [ -z $APT_CACHER_NG_PORT ] +then + echo -n "DIRECT" + exit +fi + +echo nc -w1 -z "$APT_CACHER_NG_IP" "$APT_CACHER_NG_PORT" +if nc -w1 -z "$APT_CACHER_NG_IP" "$APT_CACHER_NG_PORT" 2> /dev/null +then + echo -n "http://${APT_CACHER_NG_IP}:${APT_CACHER_NG_PORT}" else echo -n "DIRECT" fi From c71d319c77f74df7e9777fd6c3dab6e7566355ed Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:44:40 +0200 Subject: [PATCH 07/25] bug: removed echo --- docker/apt-proxy-detect.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/apt-proxy-detect.sh b/docker/apt-proxy-detect.sh index c0b45e6..69b0352 100755 --- a/docker/apt-proxy-detect.sh +++ b/docker/apt-proxy-detect.sh @@ -12,7 +12,6 @@ then exit fi -echo nc -w1 -z "$APT_CACHER_NG_IP" "$APT_CACHER_NG_PORT" if nc -w1 -z "$APT_CACHER_NG_IP" "$APT_CACHER_NG_PORT" 2> /dev/null then echo -n "http://${APT_CACHER_NG_IP}:${APT_CACHER_NG_PORT}" From f3791c0e82e79db23c4dd5be4eedd9fdeef914e6 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:44:57 +0200 Subject: [PATCH 08/25] better name --- docker/compose.yaml | 2 +- docker/run-bash.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/compose.yaml b/docker/compose.yaml index 9b65aa9..083a317 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -2,7 +2,7 @@ version: '3.5' services: my_server: - image: exsample/my_server + image: apt-cacher-ng/ubuntu:latest build: . environment: APT_CACHER_NG_IP: '172.17.0.1' diff --git a/docker/run-bash.sh b/docker/run-bash.sh index b10f5ac..6495b03 100644 --- a/docker/run-bash.sh +++ b/docker/run-bash.sh @@ -1,2 +1,2 @@ -docker run -e APT_CACHER_NG_IP=172.17.0.1 -e APT_CACHER_NG_PORT=3142 -it exsample/my_server /bin/bash +docker run -e APT_CACHER_NG_IP=172.17.0.1 -e APT_CACHER_NG_PORT=3142 -it apt-cacher-ng/ubuntu:latest /bin/bash From 89a80cfb832a236fe44fbce586a7ecc43f594242 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:45:20 +0200 Subject: [PATCH 09/25] chmod +x --- docker/run-bash.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/run-bash.sh diff --git a/docker/run-bash.sh b/docker/run-bash.sh old mode 100644 new mode 100755 From f36d826d7c2345e545734dc5a256dca88f6a0393 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:48:08 +0200 Subject: [PATCH 10/25] added helptext for sample code --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9de2375..d07376a 100644 --- a/README.md +++ b/README.md @@ -149,6 +149,7 @@ Similarly, to use Apt-Cacher NG in you Docker containers add the following line RUN echo 'Acquire::HTTP::Proxy "http://172.17.0.1:3142";' >> /etc/apt/apt.conf.d/01proxy \ && echo 'Acquire::HTTPS::Proxy "false";' >> /etc/apt/apt.conf.d/01proxy ``` +if you want to create your own image that has apt-cacher-ng preinstalled look at the sample config in the docker directory ## Logs From be6309889ced0e9727c2454e284890b7c5884683 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 14:51:26 +0200 Subject: [PATCH 11/25] moved back not part of docker config --- docker/01proxy => 01proxy | 0 docker/apt-proxy-detect.sh => apt-proxy-detect.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docker/01proxy => 01proxy (100%) rename docker/apt-proxy-detect.sh => apt-proxy-detect.sh (100%) diff --git a/docker/01proxy b/01proxy similarity index 100% rename from docker/01proxy rename to 01proxy diff --git a/docker/apt-proxy-detect.sh b/apt-proxy-detect.sh similarity index 100% rename from docker/apt-proxy-detect.sh rename to apt-proxy-detect.sh From eb3b8d2e0e753a2f0379bbce58b8fb053229a48b Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 15:39:20 +0200 Subject: [PATCH 12/25] changed from ENV to ARG --- docker/compose.yaml | 10 ++++++---- docker/run-bash.sh | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100755 docker/run-bash.sh diff --git a/docker/compose.yaml b/docker/compose.yaml index 083a317..40a2f5b 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -3,7 +3,9 @@ version: '3.5' services: my_server: image: apt-cacher-ng/ubuntu:latest - build: . - environment: - APT_CACHER_NG_IP: '172.17.0.1' - APT_CACHER_NG_PORT: '3142' + build: + context: . + args: + UBUNTU_VERSION: 'lunar' + APT_CACHER_NG_IP: '172.17.0.1' + APT_CACHER_NG_PORT: '3142' diff --git a/docker/run-bash.sh b/docker/run-bash.sh deleted file mode 100755 index 6495b03..0000000 --- a/docker/run-bash.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker run -e APT_CACHER_NG_IP=172.17.0.1 -e APT_CACHER_NG_PORT=3142 -it apt-cacher-ng/ubuntu:latest /bin/bash - From 7f63c601c1905dcfe418c54a7f06e106f4ece490 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 15:40:01 +0200 Subject: [PATCH 13/25] changed to build time config --- docker/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1285adf..7b6a057 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,11 @@ -FROM ubuntu:latest +ARG UBUNTU_VERSION=latest +FROM ubuntu:$UBUNTU_VERSION -COPY 01proxy /etc/apt/apt.conf.d/ -COPY apt-proxy-detect.sh /usr/local/bin/ +ARG APT_CACHER_NG_IP +ARG APT_CACHER_NG_PORT=3142 + +RUN echo "Acquire::HTTP::Proxy \"http://$APT_CACHER_NG_IP:$APT_CACHER_NG_PORT\";" > /etc/apt/apt.conf.d/01proxy \ + && echo "Acquire::HTTPS::Proxy \"false\";" >> /etc/apt/apt.conf.d/01proxy RUN apt-get update && \ - apt-get install -y netcat && \ apt-get upgrade -y From 9657dfbd50d0feb63b6a2b697e53d381b6171ee8 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 15:56:14 +0200 Subject: [PATCH 14/25] define args in .env --- docker/compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/compose.yaml b/docker/compose.yaml index 40a2f5b..a40f3d5 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -2,10 +2,10 @@ version: '3.5' services: my_server: - image: apt-cacher-ng/ubuntu:latest + image: apt-cacher-ng/ubuntu:${UBUNTU_VERSION} build: context: . args: - UBUNTU_VERSION: 'lunar' - APT_CACHER_NG_IP: '172.17.0.1' - APT_CACHER_NG_PORT: '3142' + UBUNTU_VERSION: '${UBUNTU_VERSION}' + APT_CACHER_NG_IP: '${APT_CACHER_NG_IP}' + APT_CACHER_NG_PORT: '${APT_CACHER_NG_PORT}' From c8852e1df328479026d94edbdc415eda659dec05 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Oct 2023 15:57:32 +0200 Subject: [PATCH 15/25] added .env file --- docker/.env | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docker/.env diff --git a/docker/.env b/docker/.env new file mode 100644 index 0000000..7bdc89f --- /dev/null +++ b/docker/.env @@ -0,0 +1,3 @@ +UBUNTU_VERSION=latest +APT_CACHER_NG_IP=172.17.0.1 +APT_CACHER_NG_PORT=3142 From 0c36cb1fdbdf2af60bd66d5e82364a431f6a2f31 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Fri, 27 Oct 2023 08:52:33 +0200 Subject: [PATCH 16/25] moved to host folder --- README.md | 6 +++--- 01proxy => host/01proxy | 0 apt-proxy-detect.sh => host/apt-proxy-detect.sh | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename 01proxy => host/01proxy (100%) rename apt-proxy-detect.sh => host/apt-proxy-detect.sh (100%) diff --git a/README.md b/README.md index d07376a..6a9aeee 100644 --- a/README.md +++ b/README.md @@ -137,10 +137,10 @@ Acquire::HTTPS::Proxy "false"; ``` If you are using a Laptop that is not always able to reach apt-proxy-ng -in order to be able to bypass the proxy, use the these 2 files +in order to be able detect where to use the proxy or connect direct, use the these 2 files on the Laptop ``` -cp 01proxy /etc/apt/apt.conf.d/ -cp apt-proxy-detect.sh /usr/local/bin/ +cp host/01proxy /etc/apt/apt.conf.d/ +cp host/apt-proxy-detect.sh /usr/local/bin/ ``` Similarly, to use Apt-Cacher NG in you Docker containers add the following line to your `Dockerfile` before any `apt-get` commands. diff --git a/01proxy b/host/01proxy similarity index 100% rename from 01proxy rename to host/01proxy diff --git a/apt-proxy-detect.sh b/host/apt-proxy-detect.sh similarity index 100% rename from apt-proxy-detect.sh rename to host/apt-proxy-detect.sh From b3d389724fb8e5dd8deb5c0cac0e25358a06f3bd Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 6 Feb 2024 15:12:13 +0100 Subject: [PATCH 17/25] added jet brains --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 0299eae..c2985ab 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,6 @@ Sessionx.vim *~ # Persistent undo [._]*.un~ + +# jet brains +.idea From a7f8df324038313d166b2c8fc6cb6146a99a1102 Mon Sep 17 00:00:00 2001 From: Peter Bom Jakobsen Date: Thu, 11 Jul 2024 14:49:06 +0200 Subject: [PATCH 18/25] Use Docker volume --- docker-compose.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ea4b9d8..a5c7b43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,4 +8,7 @@ services: ports: - "3142:3142" volumes: - - /srv/docker/apt-cacher-ng:/var/cache/apt-cacher-ng + - apt-cacher-ng:/var/cache/apt-cacher-ng + +volumes: + apt-cacher-ng: From 3e887c2c548fe76af53c0734d2a0d571d5f26ce3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:55:20 +0000 Subject: [PATCH 19/25] build(deps): bump ubuntu from jammy-20230816 to jammy-20240808 Bumps ubuntu from jammy-20230816 to jammy-20240808. --- updated-dependencies: - dependency-name: ubuntu dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b070be..cb09c25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20230816 +FROM ubuntu:jammy-20240808 LABEL maintainer="sameer@damagehead.com" From a494a5c45b5da0b995e49b4d38679342e4f4ca6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:55:21 +0000 Subject: [PATCH 20/25] build(deps): bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ac4f0a..f155e4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: output: 'results.sarif' - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: results.sarif category: results From 296c9534d99510eb45d56759ea237b85fe304f35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:55:23 +0000 Subject: [PATCH 21/25] build(deps): bump docker/metadata-action from 4 to 5 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ac4f0a..0b08637 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,7 +120,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | sameersbn/apt-cacher-ng From 1e5157d2dadb3dee2584cd72169bb676bb3ae6e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:55:25 +0000 Subject: [PATCH 22/25] build(deps): bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ac4f0a..4a48994 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to ghcr.io registry uses: docker/login-action@v2 @@ -133,7 +133,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub if: github.event_name != 'pull_request' From 2b15b5ee2807a6efbcb00204f93b882e8d3c5e74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:55:26 +0000 Subject: [PATCH 23/25] build(deps): bump docker/build-push-action from 4 to 6 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ac4f0a..2e4eaa8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and Push to GHCR - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . push: true @@ -159,7 +159,7 @@ jobs: password: ${{ secrets.QUAY_TOKEN }} - name: Build image and push to container registries - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . push: ${{ github.event_name != 'pull_request' }} From a2cb568a250ec1b16bdac36e301acebc488eb2dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:55:29 +0000 Subject: [PATCH 24/25] build(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ac4f0a..55435ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout git repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -58,7 +58,7 @@ jobs: steps: - name: Checkout git repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Login to ghcr.io registry uses: docker/login-action@v2 @@ -80,7 +80,7 @@ jobs: steps: - name: Checkout git repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Login to ghcr.io registry uses: docker/login-action@v2 @@ -116,7 +116,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker meta id: meta From 12ecfef717e7ec80bd9eb2cc757bc47bf8b076ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 10:14:07 +0000 Subject: [PATCH 25/25] build(deps): bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0061070..0a690d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to ghcr.io registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -61,7 +61,7 @@ jobs: uses: actions/checkout@v4 - name: Login to ghcr.io registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -83,7 +83,7 @@ jobs: uses: actions/checkout@v4 - name: Login to ghcr.io registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -137,14 +137,14 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Github Packages if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -152,7 +152,7 @@ jobs: - name: Login to Quay.io if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: quay.io username: ${{ secrets.QUAY_USERNAME }}