tcwg-base: Expose ssh port in tcwg-build, where it is used

Change-Id: Ibe31bf05234d89a858e9e0c042f2642f8225359d

14 files changed, 31 insertions, 39 deletions

diff --git a/focal-amd64-tcwg-base/Dockerfile b/focal-amd64-tcwg-base/Dockerfile
index 8f3e23d0..6c7ed6ff 100644
--- a/focal-amd64-tcwg-base/Dockerfile
+++ b/focal-amd64-tcwg-base/Dockerfile
@@ -322,7 +322,4 @@ RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \
 # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
 # cleanup host directories used for the scratch mounts.
 VOLUME /tmp
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
-# This is a dummy comment to trigger a base image rebuild.
-# checksum: a3189ffcf2a879f188230ca64162be43
+# checksum: d2851e5a313f54da5f586d28f7ccf63f
diff --git a/focal-amd64-tcwg-base/focal-amd64-tcwg-build/Dockerfile b/focal-amd64-tcwg-base/focal-amd64-tcwg-build/Dockerfile
index a06fbea8..1d8c5d29 100644
--- a/focal-amd64-tcwg-base/focal-amd64-tcwg-build/Dockerfile
+++ b/focal-amd64-tcwg-base/focal-amd64-tcwg-build/Dockerfile
@@ -39,4 +39,6 @@ RUN \
  /var/tmp/* \
  # This will override llvm-objdump installed by tcwg-base's llvm package.
  && ln -s `which llvm-objdump-11` /usr/local/bin/llvm-objdump
-# checksum: 4a6718d410939e630d9cfe3a1434523a
+EXPOSE 22
+CMD ["/usr/sbin/sshd", "-D"]
+# checksum: 1312962bdcfaadb69391055f90a29a76
diff --git a/focal-arm64-tcwg-base/Dockerfile b/focal-arm64-tcwg-base/Dockerfile
index 76400f48..20188955 100644
--- a/focal-arm64-tcwg-base/Dockerfile
+++ b/focal-arm64-tcwg-base/Dockerfile
@@ -303,7 +303,4 @@ RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \
 # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
 # cleanup host directories used for the scratch mounts.
 VOLUME /tmp
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
-# This is a dummy comment to trigger a base image rebuild.
-# checksum: c38eece402c64fa2c214420831b4775d
+# checksum: a0d77498fc6f3ac97d72701883e1bc30
diff --git a/focal-arm64-tcwg-base/focal-arm64-tcwg-build/Dockerfile b/focal-arm64-tcwg-base/focal-arm64-tcwg-build/Dockerfile
index 71927684..f8a4976b 100644
--- a/focal-arm64-tcwg-base/focal-arm64-tcwg-build/Dockerfile
+++ b/focal-arm64-tcwg-base/focal-arm64-tcwg-build/Dockerfile
@@ -29,4 +29,6 @@ RUN \
  /var/tmp/* \
  # This will override llvm-objdump installed by tcwg-base's llvm package.
  && ln -s `which llvm-objdump-11` /usr/local/bin/llvm-objdump
-# checksum: f4581c2c071379c5b031871727887448
+EXPOSE 22
+CMD ["/usr/sbin/sshd", "-D"]
+# checksum: f711e86a7fd1d6c83b0c985c3e876905
diff --git a/focal-armhf-tcwg-base/Dockerfile b/focal-armhf-tcwg-base/Dockerfile
index 7de45301..7abd0b8f 100644
--- a/focal-armhf-tcwg-base/Dockerfile
+++ b/focal-armhf-tcwg-base/Dockerfile
@@ -309,7 +309,4 @@ RUN echo $'if [ "$(uname -m)" == "aarch64" ] || [ "$(uname -m)" == "x86_64" ]; t
 # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
 # cleanup host directories used for the scratch mounts.
 VOLUME /tmp
-EXPOSE 22
-CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# This is a dummy comment to trigger a base image rebuild.
-# checksum: 33dcd3b146cf6b5229a189e1c404e8ee
+# checksum: 128194e695aa0f51624712cfcc76a342
diff --git a/focal-armhf-tcwg-base/focal-armhf-tcwg-build/Dockerfile b/focal-armhf-tcwg-base/focal-armhf-tcwg-build/Dockerfile
index b4894d67..37ef2da0 100644
--- a/focal-armhf-tcwg-base/focal-armhf-tcwg-build/Dockerfile
+++ b/focal-armhf-tcwg-base/focal-armhf-tcwg-build/Dockerfile
@@ -29,4 +29,6 @@ RUN \
  /var/tmp/* \
  # This will override llvm-objdump installed by tcwg-base's llvm package.
  && ln -s `which llvm-objdump-11` /usr/local/bin/llvm-objdump
-# checksum: a2e2ec304d81da94f161c54c20ea298d
+EXPOSE 22
+CMD ["linux32", "/usr/sbin/sshd", "-D"]
+# checksum: 7d1696987abf9a37566db87cb37176fa
diff --git a/jammy-amd64-tcwg-base/Dockerfile b/jammy-amd64-tcwg-base/Dockerfile
index b4401bc7..543f58c7 100644
--- a/jammy-amd64-tcwg-base/Dockerfile
+++ b/jammy-amd64-tcwg-base/Dockerfile
@@ -324,7 +324,4 @@ RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \
 # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
 # cleanup host directories used for the scratch mounts.
 VOLUME /tmp
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
-# This is a dummy comment to trigger a base image rebuild.
-# checksum: 6abe91c402501929753104a36a53da66
+# checksum: 1e967738b035da8585990266907529b8
diff --git a/jammy-amd64-tcwg-base/jammy-amd64-tcwg-build/Dockerfile b/jammy-amd64-tcwg-base/jammy-amd64-tcwg-build/Dockerfile
index 020908f6..7a5c7c40 100644
--- a/jammy-amd64-tcwg-base/jammy-amd64-tcwg-build/Dockerfile
+++ b/jammy-amd64-tcwg-base/jammy-amd64-tcwg-build/Dockerfile
@@ -26,4 +26,6 @@ RUN \
  /var/lib/apt/lists/* \
  /tmp/* \
  /var/tmp/*
-# checksum: 1322aafd37c1e25c38b6b627e3c475ff
+EXPOSE 22
+CMD ["/usr/sbin/sshd", "-D"]
+# checksum: a7ff2a9e9edc3cc1c053394515637d3b
diff --git a/jammy-arm64-tcwg-base/Dockerfile b/jammy-arm64-tcwg-base/Dockerfile
index 4c939f20..7dccf0d8 100644
--- a/jammy-arm64-tcwg-base/Dockerfile
+++ b/jammy-arm64-tcwg-base/Dockerfile
@@ -305,7 +305,4 @@ RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \
 # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
 # cleanup host directories used for the scratch mounts.
 VOLUME /tmp
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
-# This is a dummy comment to trigger a base image rebuild.
-# checksum: ff825fc7d2c78670adfaff39d0d05a90
+# checksum: 99aa5e7c6581f1305ad1111f5cb24c5c
diff --git a/jammy-arm64-tcwg-base/jammy-arm64-tcwg-build/Dockerfile b/jammy-arm64-tcwg-base/jammy-arm64-tcwg-build/Dockerfile
index a377af8e..db621010 100644
--- a/jammy-arm64-tcwg-base/jammy-arm64-tcwg-build/Dockerfile
+++ b/jammy-arm64-tcwg-base/jammy-arm64-tcwg-build/Dockerfile
@@ -16,4 +16,6 @@ RUN while read line; do \
 # - TK1s have small disk, so try to get by with 10G.
 RUN sudo -i -u tcwg-buildslave mkdir -p /home/tcwg-buildslave/.ccache \
  && sudo -i -u tcwg-buildslave ccache -M 50G
-# checksum: 848b185837dfcd3314a2efa3a51b4b5f
+EXPOSE 22
+CMD ["/usr/sbin/sshd", "-D"]
+# checksum: 150d78a7ace61813849e4d01df43184d
diff --git a/jammy-armhf-tcwg-base/Dockerfile b/jammy-armhf-tcwg-base/Dockerfile
index 78e356d5..d495a9b0 100644
--- a/jammy-armhf-tcwg-base/Dockerfile
+++ b/jammy-armhf-tcwg-base/Dockerfile
@@ -315,7 +315,4 @@ RUN echo $'if [ "$(uname -m)" == "aarch64" ] || [ "$(uname -m)" == "x86_64" ]; t
 # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
 # cleanup host directories used for the scratch mounts.
 VOLUME /tmp
-EXPOSE 22
-CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# This is a dummy comment to trigger a base image rebuild.
-# checksum: c703892b252d152771e3928eb17e2f65
+# checksum: 483fa926c92991c689c0bc71750b0963
diff --git a/jammy-armhf-tcwg-base/jammy-armhf-tcwg-build/Dockerfile b/jammy-armhf-tcwg-base/jammy-armhf-tcwg-build/Dockerfile
index a572a1b2..8376e3fe 100644
--- a/jammy-armhf-tcwg-base/jammy-armhf-tcwg-build/Dockerfile
+++ b/jammy-armhf-tcwg-base/jammy-armhf-tcwg-build/Dockerfile
@@ -16,4 +16,6 @@ RUN while read line; do \
 # - TK1s have small disk, so try to get by with 10G.
 RUN sudo -i -u tcwg-buildslave mkdir -p /home/tcwg-buildslave/.ccache \
  && sudo -i -u tcwg-buildslave ccache -M 10G
-# checksum: 3db7084b1504bf636c8d96573a9299d1
+EXPOSE 22
+CMD ["linux32", "/usr/sbin/sshd", "-D"]
+# checksum: c60a2dda816198ced45518de323d94eb
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 31b1a18d..116f96f2 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -417,12 +417,3 @@ RUN echo $'if [ "$(uname -m)" == "aarch64" ] || [ "$(uname -m)" == "x86_64" ]; t
 # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to
 # cleanup host directories used for the scratch mounts.
 VOLUME /tmp
-
-EXPOSE 22
-#if ARCH_amd64 || ARCH_arm64
-CMD ["/usr/sbin/sshd", "-D"]
-#else
-CMD ["linux32", "/usr/sbin/sshd", "-D"]
-#endif
-
-# This is a dummy comment to trigger a base image rebuild.
diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in
index db34a084..af36e90b 100644
--- a/tcwg-base/tcwg-build/Dockerfile.in
+++ b/tcwg-base/tcwg-build/Dockerfile.in
@@ -50,3 +50,10 @@ RUN \
  # This will override llvm-objdump installed by tcwg-base's llvm package.
  && ln -s `which llvm-objdump-11` /usr/local/bin/llvm-objdump
 #endif
+
+EXPOSE 22
+#if ARCH_amd64 || ARCH_arm64
+CMD ["/usr/sbin/sshd", "-D"]
+#else
+CMD ["linux32", "/usr/sbin/sshd", "-D"]
+#endif