Merge remote-tracking branch 'origin/trunk' into release-v4.0.0-rc.8

atsign-foundation · Nov 21, 2023 · e2b8f4f · e2b8f4f
2 parents ae4a567 + a2c020c
commit e2b8f4f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/sshnoports/templates/docker/Dockerfile b/packages/sshnoports/templates/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN \
   dart compile exe bin/sshrv.dart -o ${BINARYDIR}/sshrv
 
 # Second stage of build FROM debian-slim
-FROM debian:stable-20231030-slim@sha256:1529b15b786397b4695b1685d4e37b3dde62420862c0546fa364d0e889473c20
+FROM debian:stable-20231120-slim@sha256:375fb84f3c64691a1b9a9ff5ff3905173dcd0c5e11bc2aebd5c3472a139fa2b4
 ENV USER=atsign
 ENV HOMEDIR=/${USER}
 ENV BINARYDIR=/usr/local/at

diff --git a/packages/sshnoports/templates/docker/Dockerfile.activate b/packages/sshnoports/templates/docker/Dockerfile.activate
@@ -13,7 +13,7 @@ RUN \
   dart compile exe bin/activate_cli.dart -o ${BINARYDIR}/at_activate
 
 # Second stage of build FROM debian-slim
-FROM debian:stable-20231030-slim@sha256:1529b15b786397b4695b1685d4e37b3dde62420862c0546fa364d0e889473c20
+FROM debian:stable-20231120-slim@sha256:375fb84f3c64691a1b9a9ff5ff3905173dcd0c5e11bc2aebd5c3472a139fa2b4
 ENV USER=atsign
 ENV HOMEDIR=/${USER}
 ENV BINARYDIR=/usr/local/at

diff --git a/packages/sshnpdpy/pyproject.toml b/packages/sshnpdpy/pyproject.toml
@@ -13,7 +13,7 @@ cryptography = "^41.0.3"
 paramiko = "3.3.1"
 pycparser = "^2.21"
 PyNaCl = "^1.5.0"
-setuptools = "^68.2.2"
+setuptools = "^69.0.0"
 
 
 [build-system]

diff --git a/tests/end2end_tests/image/Dockerfile b/tests/end2end_tests/image/Dockerfile
@@ -1,5 +1,5 @@
 # BASE
-FROM debian:stable-20231030-slim@sha256:1529b15b786397b4695b1685d4e37b3dde62420862c0546fa364d0e889473c20 AS base
+FROM debian:stable-20231120-slim@sha256:375fb84f3c64691a1b9a9ff5ff3905173dcd0c5e11bc2aebd5c3472a139fa2b4 AS base
 
 ENV USER=atsign
 ENV HOMEDIR=/${USER}
@@ -101,7 +101,7 @@ ENTRYPOINT cp -r /mount/. ${HOMEDIR} && sudo service ssh start && sh ${HOMEDIR}/
 
 # RELEASE
 # BUILD RELEASE
-FROM debian:stable-20231030-slim@sha256:1529b15b786397b4695b1685d4e37b3dde62420862c0546fa364d0e889473c20 AS build-release
+FROM debian:stable-20231120-slim@sha256:375fb84f3c64691a1b9a9ff5ff3905173dcd0c5e11bc2aebd5c3472a139fa2b4 AS build-release
 
 ARG release