diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2024-04-26 16:47:55 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2024-04-26 16:47:55 +0000 |
| commit | 3d239666a1b1d0f666e4cdc638798ea49f43db16 (patch) | |
| tree | 04255501722d8427bb7b76754c599f5475a25109 /tcwg-base | |
| parent | af12bde6286bac50ee505b45a47453aa0771b0f4 (diff) | |
tcwg-base: Expose ssh port in tcwg-build, where it is used
Change-Id: Ibe31bf05234d89a858e9e0c042f2642f8225359d
Diffstat (limited to 'tcwg-base')
| -rw-r--r-- | tcwg-base/Dockerfile.in | 9 | ||||
| -rw-r--r-- | tcwg-base/tcwg-build/Dockerfile.in | 7 |
2 files changed, 7 insertions, 9 deletions
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 |