From d8c3fc3c07bf3f77f90f4f508a851f5fed398a0b Mon Sep 17 00:00:00 2001 From: Murali Date: Sat, 28 Sep 2024 12:06:20 +0530 Subject: [PATCH 1/6] chore: upgrade dependencies --- packages/dart/noports_core/CHANGELOG.md | 3 ++ packages/dart/noports_core/pubspec.yaml | 10 +++---- packages/dart/sshnoports/pubspec.lock | 38 ++++++++++++------------- packages/dart/sshnoports/pubspec.yaml | 6 ++-- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/packages/dart/noports_core/CHANGELOG.md b/packages/dart/noports_core/CHANGELOG.md index 805985aa0..77ad68c68 100644 --- a/packages/dart/noports_core/CHANGELOG.md +++ b/packages/dart/noports_core/CHANGELOG.md @@ -1,3 +1,6 @@ +# 6.1.1 +- build[deps]: upgrade: \ + at_client to 3.2.2 | at_onboarding_cli to 1.6.4 | at_utils to 3.0.19 | at_commons to 5.0.0 # 6.1.0 - feat: npt: added 'keep-alive' flag, and an adjustable session timeout (#1110) - fix: sshnpd: ensure required directories exist (#1139) diff --git a/packages/dart/noports_core/pubspec.yaml b/packages/dart/noports_core/pubspec.yaml index 2bacd7a62..8afb9d427 100644 --- a/packages/dart/noports_core/pubspec.yaml +++ b/packages/dart/noports_core/pubspec.yaml @@ -2,17 +2,17 @@ name: noports_core description: Core library code for sshnoports homepage: https://docs.atsign.com/ -version: 6.1.0 +version: 6.1.1 environment: sdk: ">=3.0.0 <4.0.0" dependencies: args: ^2.4.2 - at_chops: ^2.0.0 - at_client: ^3.2.0 - at_commons: ^4.0.3 - at_utils: ^3.0.16 + at_chops: ^2.0.1 + at_client: ^3.2.2 + at_commons: ^5.0.0 + at_utils: ^3.0.19 cryptography: ^2.7.0 dartssh2: ^2.8.2 file: ^6.0.0 diff --git a/packages/dart/sshnoports/pubspec.lock b/packages/dart/sshnoports/pubspec.lock index 5beec4ffe..6a0dbfeaf 100644 --- a/packages/dart/sshnoports/pubspec.lock +++ b/packages/dart/sshnoports/pubspec.lock @@ -54,10 +54,10 @@ packages: dependency: transitive description: name: at_auth - sha256: "28f72f0fc26ec7f5f58d28fd29f964c9b2b35ecdc8dd4805ed7174851da2cbcc" + sha256: f4fec32e2a1ca8827604b5e54a7611ddad092c6ba607c138675c1cba5215b038 url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.7" at_base2e15: dependency: transitive description: @@ -70,10 +70,10 @@ packages: dependency: transitive description: name: at_chops - sha256: "825171a3132b3756119bd16b6fd1fa6257f74a64babaf13cae2d82d53b8c6be1" + sha256: "0b3d84b8bd2e5027946253d907ff23f967922105efe27432b15743beb74b31f8" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" at_cli_commons: dependency: "direct main" description: @@ -86,18 +86,18 @@ packages: dependency: "direct main" description: name: at_client - sha256: a20b991cc0f7d2cec8362194eafc972945bec476539d107db1cc0e8780a88da9 + sha256: "2c6aca2b3a2dab16b58330f99bdd00fe05bd05a76ffc5ed6b0d0eb34aaaaab8a" url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" at_commons: dependency: transitive description: name: at_commons - sha256: "5980b2bb7b8668fcd80bcda17161df350472e3449bbc30a60a1c7ca23c58d505" + sha256: "796eb7f49ab8894782010146368b4ae4f9ed716f2174c29c37d5c53b81281ff6" url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "5.0.0" at_demo_data: dependency: transitive description: @@ -110,26 +110,26 @@ packages: dependency: transitive description: name: at_lookup - sha256: "8ba3ecbf5ae8119bda3e24e28b756c7ef927ccb6796b639af0e003f9edd54825" + sha256: "2fa727fbdd6d3e5a79132786a74cbf03776833e1671f8cb471d21585f8448f95" url: "https://pub.dev" source: hosted - version: "3.0.48" + version: "3.0.49" at_onboarding_cli: dependency: "direct main" description: name: at_onboarding_cli - sha256: "1737a8d5da62344e35fab9a0fea7ee77123d9ccf89d1d008cdeab4edd70ba868" + sha256: "9797347880162490efd47f06df8b26f667bff9e00d31d6ea176660c9b9ced06e" url: "https://pub.dev" source: hosted - version: "1.6.3" + version: "1.6.4" at_persistence_secondary_server: dependency: transitive description: name: at_persistence_secondary_server - sha256: "1ec73b56e61b8aee94104ad4610c17cf07e366239337bedd43fa80c7765a391d" + sha256: "387ff2853ee98a8c65526e1df9220fa58c4631b9b1cd6002e9a7372f1a491ed3" url: "https://pub.dev" source: hosted - version: "3.0.63" + version: "3.0.64" at_persistence_spec: dependency: transitive description: @@ -142,10 +142,10 @@ packages: dependency: transitive description: name: at_server_status - sha256: "316c3e6717592677207d4f0a836b013271ca0f729e8b575c9195d19cfc57e71b" + sha256: "2773fa7c4377802b671f6854863214aabe8ee8cd49be87226352dd14562a5d6b" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" at_utf7: dependency: transitive description: @@ -158,10 +158,10 @@ packages: dependency: "direct main" description: name: at_utils - sha256: "29be5ecaa9861845232f800b7fd0ddfc8b2ad2b38b3e8b6e05972b4bd0defa62" + sha256: b4461b0743f323429d57c387e91186537df8a6aeb4608bbeb6c2adf01d9f08f9 url: "https://pub.dev" source: hosted - version: "3.0.18" + version: "3.0.19" boolean_selector: dependency: transitive description: @@ -923,4 +923,4 @@ packages: source: hosted version: "0.2.3" sdks: - dart: ">=3.5.0-259.0.dev <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/packages/dart/sshnoports/pubspec.yaml b/packages/dart/sshnoports/pubspec.yaml index 8aa264f2d..43da1f42f 100644 --- a/packages/dart/sshnoports/pubspec.yaml +++ b/packages/dart/sshnoports/pubspec.yaml @@ -9,14 +9,14 @@ environment: dependencies: noports_core: path: "../noports_core" - at_onboarding_cli: 1.6.3 + at_onboarding_cli: 1.6.4 at_cli_commons: ^1.1.0 - at_client: ^3.2.1 + at_client: ^3.2.2 args: 2.5.0 socket_connector: ^2.2.0 dartssh2: 2.8.2 duration: ^4.0.3 - at_utils: 3.0.18 + at_utils: 3.0.19 logging: ^1.2.0 chalkdart: ^2.2.1 yaml: ^3.1.2 From 84e2dfb4f3b2de62b9e8cf818dd8ce00cf2d9751 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 04:20:15 +0000 Subject: [PATCH 2/6] build(deps): Bump docker/build-push-action in the github-actions group Bumps the github-actions group with 1 update: [docker/build-push-action](https://github.com/docker/build-push-action). Updates `docker/build-push-action` from 6.7.0 to 6.8.0 - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/5cd11c3a4ced054e52742c5fd54dca954e0edd85...32945a339266b759abcbdc89316275140b0fc960) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/dockerhub_sshnpd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub_sshnpd.yml b/.github/workflows/dockerhub_sshnpd.yml index ebc54cc96..0dfd43c43 100644 --- a/.github/workflows/dockerhub_sshnpd.yml +++ b/.github/workflows/dockerhub_sshnpd.yml @@ -45,7 +45,7 @@ jobs: - name: Get version run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV - name: Build and push - uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0 + uses: docker/build-push-action@32945a339266b759abcbdc89316275140b0fc960 # v6.8.0 with: context: . file: ${{ matrix.dockerfile }} 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 3/6] 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 c1a70e89ba7dc42879dfa78b49cedc4d984fb70f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 04:41:30 +0000 Subject: [PATCH 4/6] build(deps): Bump noports_core Bumps the pub group with 1 update in the /packages/dart/sshnoports directory: noports_core. Updates `noports_core` from 6.1.0 to 6.1.1 --- updated-dependencies: - dependency-name: noports_core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub ... Signed-off-by: dependabot[bot] --- packages/dart/sshnoports/pubspec.lock | 2 +- packages/dart/sshnoports/pubspec.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/dart/sshnoports/pubspec.lock b/packages/dart/sshnoports/pubspec.lock index 6a0dbfeaf..8bd3b88dd 100644 --- a/packages/dart/sshnoports/pubspec.lock +++ b/packages/dart/sshnoports/pubspec.lock @@ -593,7 +593,7 @@ packages: path: "../noports_core" relative: true source: path - version: "6.1.0" + version: "6.1.1" openssh_ed25519: dependency: transitive description: diff --git a/packages/dart/sshnoports/pubspec.yaml b/packages/dart/sshnoports/pubspec.yaml index 43da1f42f..b073bb8d5 100644 --- a/packages/dart/sshnoports/pubspec.yaml +++ b/packages/dart/sshnoports/pubspec.yaml @@ -9,6 +9,7 @@ environment: dependencies: noports_core: path: "../noports_core" + version: 6.1.1 at_onboarding_cli: 1.6.4 at_cli_commons: ^1.1.0 at_client: ^3.2.2 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 5/6] 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 From f81faf18bbbaee876cabb64641a733beaa243aa3 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:40:04 +0100 Subject: [PATCH 6/6] fix: Use restart for systemd service --- packages/dart/sshnoports/bundles/universal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dart/sshnoports/bundles/universal.sh b/packages/dart/sshnoports/bundles/universal.sh index bda62068e..0f8742d49 100755 --- a/packages/dart/sshnoports/bundles/universal.sh +++ b/packages/dart/sshnoports/bundles/universal.sh @@ -910,7 +910,7 @@ device() { write_systemd_environment "$systemd_service" "device_name" "$device_name" systemctl enable sshnpd - systemctl start sshnpd + systemctl restart sshnpd echo "sshnpd installed with systemd. To see logs use:" echo "journalctl -u sshnpd.service -f"