From 2006a0269293d25ca6f425ecf41a33f247b09f2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 04:34:40 +0000 Subject: [PATCH 1/2] build(deps): Bump the docker group across 3 directories with 3 updates Bumps the docker group with 2 updates in the /packages/dart/sshnoports/tools directory: dart and debian. Bumps the docker group with 2 updates in the /tests/end2end_tests/image directory: dart and debian. Bumps the docker group with 1 update in the /tools/multibuild directory: atsigncompany/buildimage. Updates `dart` from `131b146` to `93ce3d3` Updates `debian` from stable-20240904-slim to stable-20240926-slim Updates `dart` from `131b146` to `93ce3d3` Updates `debian` from stable-20240904-slim to stable-20240926-slim Updates `atsigncompany/buildimage` from 3.5.2 to 3.5.2_3.6.0-149.3.beta --- updated-dependencies: - dependency-name: dart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: docker - dependency-name: debian dependency-type: direct:production dependency-group: docker - dependency-name: dart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: docker - dependency-name: debian dependency-type: direct:production dependency-group: docker - dependency-name: atsigncompany/buildimage dependency-type: direct:production update-type: version-update:semver-patch dependency-group: docker ... Signed-off-by: dependabot[bot] --- packages/dart/sshnoports/tools/Dockerfile | 4 ++-- packages/dart/sshnoports/tools/Dockerfile.activate | 4 ++-- packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim | 2 +- tests/end2end_tests/image/Dockerfile | 8 ++++---- tools/multibuild/Dockerfile.package | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/dart/sshnoports/tools/Dockerfile b/packages/dart/sshnoports/tools/Dockerfile index b41b87858..64fe53e11 100644 --- a/packages/dart/sshnoports/tools/Dockerfile +++ b/packages/dart/sshnoports/tools/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile # Build image for a containerized instance of sshnpd -FROM dart:3.5.2@sha256:131b146729dfa9b7382e307f59db18109948b0c9d40f37f0b40457c12d294bf3 AS buildimage +FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage ENV PACKAGEDIR=packages/dart/sshnoports ENV BINARYDIR=/usr/local/at SHELL ["/bin/bash", "-c"] @@ -17,7 +17,7 @@ RUN \ dart compile exe bin/srv.dart -o ${BINARYDIR}/srv # Second stage of build FROM debian-slim -FROM debian:stable-20240904-slim@sha256:64bc71feaa7ec2ac758a6a3a37c0f0d6ebccf0a45e3f5af1f1d3b5d4cb316b29 +FROM debian:stable-20240926-slim@sha256:939e69ef5aa4dc178893a718ea567f1ca390df60793fd08c0bc7008362f72a57 ENV USER=atsign ENV HOMEDIR=/${USER} ENV BINARYDIR=/usr/local/at diff --git a/packages/dart/sshnoports/tools/Dockerfile.activate b/packages/dart/sshnoports/tools/Dockerfile.activate index c0c92d2dd..3562f8463 100644 --- a/packages/dart/sshnoports/tools/Dockerfile.activate +++ b/packages/dart/sshnoports/tools/Dockerfile.activate @@ -1,6 +1,6 @@ # Dockerfile.activate # Build image for a containerized call of the at_activate binary -FROM dart:3.5.2@sha256:131b146729dfa9b7382e307f59db18109948b0c9d40f37f0b40457c12d294bf3 AS buildimage +FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage ENV PACKAGEDIR=packages/dart/sshnoports ENV BINARYDIR=/usr/local/at SHELL ["/bin/bash", "-c"] @@ -15,7 +15,7 @@ RUN \ dart compile exe bin/activate_cli.dart -o ${BINARYDIR}/at_activate # Second stage of build FROM debian-slim -FROM debian:stable-20240904-slim@sha256:64bc71feaa7ec2ac758a6a3a37c0f0d6ebccf0a45e3f5af1f1d3b5d4cb316b29 +FROM debian:stable-20240926-slim@sha256:939e69ef5aa4dc178893a718ea567f1ca390df60793fd08c0bc7008362f72a57 ENV USER=atsign ENV HOMEDIR=/${USER} ENV BINARYDIR=/usr/local/at diff --git a/packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim b/packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim index 624ab733a..a29fe2455 100644 --- a/packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim +++ b/packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim @@ -9,7 +9,7 @@ # as of 5th Feb 2024 - Will check state as 3.3 Stable is released #FROM dart:beta-sdk AS buildimage -FROM dart:3.5.2@sha256:131b146729dfa9b7382e307f59db18109948b0c9d40f37f0b40457c12d294bf3 AS buildimage +FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage ENV PACKAGEDIR=packages/dart/sshnoports ENV OPENSSH=tools/static-openssh ENV BINARYDIR=/usr/local/at diff --git a/tests/end2end_tests/image/Dockerfile b/tests/end2end_tests/image/Dockerfile index 78112796a..de4ce1090 100644 --- a/tests/end2end_tests/image/Dockerfile +++ b/tests/end2end_tests/image/Dockerfile @@ -1,5 +1,5 @@ # BASE -FROM debian:stable-20240904-slim@sha256:64bc71feaa7ec2ac758a6a3a37c0f0d6ebccf0a45e3f5af1f1d3b5d4cb316b29 AS base +FROM debian:stable-20240926-slim@sha256:939e69ef5aa4dc178893a718ea567f1ca390df60793fd08c0bc7008362f72a57 AS base ENV USER=atsign ENV HOMEDIR=/${USER} @@ -26,7 +26,7 @@ RUN set -eux ; \ # BRANCH # BUILD BRANCH -FROM dart:3.5.2@sha256:131b146729dfa9b7382e307f59db18109948b0c9d40f37f0b40457c12d294bf3 AS build-branch +FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS build-branch ENV URL=https://github.com/atsign-foundation/noports.git ENV REPO_DIR=/app/repo @@ -65,7 +65,7 @@ ENTRYPOINT cp -r /mount/. ${HOMEDIR} && sudo service ssh start && sh ${HOMEDIR}/ # LOCAL # BUILD LOCAL -FROM dart:3.5.2@sha256:131b146729dfa9b7382e307f59db18109948b0c9d40f37f0b40457c12d294bf3 AS build-local +FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS build-local ENV REPO_DIR=/app/repo ENV PACKAGE_DIR=${REPO_DIR}/packages/dart/sshnoports @@ -101,7 +101,7 @@ ENTRYPOINT cp -r /mount/. ${HOMEDIR} && sudo service ssh start && sh ${HOMEDIR}/ # RELEASE # BUILD RELEASE -FROM debian:stable-20240904-slim@sha256:64bc71feaa7ec2ac758a6a3a37c0f0d6ebccf0a45e3f5af1f1d3b5d4cb316b29 AS build-release +FROM debian:stable-20240926-slim@sha256:939e69ef5aa4dc178893a718ea567f1ca390df60793fd08c0bc7008362f72a57 AS build-release ARG release diff --git a/tools/multibuild/Dockerfile.package b/tools/multibuild/Dockerfile.package index 42b86d04c..8c55c013f 100644 --- a/tools/multibuild/Dockerfile.package +++ b/tools/multibuild/Dockerfile.package @@ -1,7 +1,7 @@ # Dockerfile.package # A dockerfile for packaging SSH No Ports releases using docker buildx -FROM atsigncompany/buildimage:3.5.2@sha256:3edb21e4d12e11d7a7a9a52af694b739eb3579c4deff2aa1ca6c31699a8af64c AS build +FROM atsigncompany/buildimage:3.5.2_3.6.0-149.3.beta@sha256:df67b9e3271381fc0c5b20e7350cf4de8dad6ac62e075b49b1a866c49af47409 AS build # Using atsigncompany/buildimage until official dart image has RISC-V support # See https://github.com/atsign-company/at_dockerfiles for source and automated builds WORKDIR /noports From 1c83735df7602f71a5d81b933f3bee5c689423c3 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:04:32 +0100 Subject: [PATCH 2/2] build(deps): Revert buildimage to newer (but shorter) tag --- tools/multibuild/Dockerfile.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/multibuild/Dockerfile.package b/tools/multibuild/Dockerfile.package index 8c55c013f..42b86d04c 100644 --- a/tools/multibuild/Dockerfile.package +++ b/tools/multibuild/Dockerfile.package @@ -1,7 +1,7 @@ # Dockerfile.package # A dockerfile for packaging SSH No Ports releases using docker buildx -FROM atsigncompany/buildimage:3.5.2_3.6.0-149.3.beta@sha256:df67b9e3271381fc0c5b20e7350cf4de8dad6ac62e075b49b1a866c49af47409 AS build +FROM atsigncompany/buildimage:3.5.2@sha256:3edb21e4d12e11d7a7a9a52af694b739eb3579c4deff2aa1ca6c31699a8af64c AS build # Using atsigncompany/buildimage until official dart image has RISC-V support # See https://github.com/atsign-company/at_dockerfiles for source and automated builds WORKDIR /noports