From 2f4d2b2cf780cf9748cda04c912713d252cb7be1 Mon Sep 17 00:00:00 2001 From: Matthew Horan Date: Tue, 15 Aug 2017 15:27:50 -0400 Subject: [PATCH] Bump diego-ssh submodule and update packaging scripts - Now use internal/external build flag to determine if port mapping will be performed by sshd. [#148169141] Signed-off-by: Sam Smith --- packages/buildpack_app_lifecycle/packaging | 4 ++-- packages/diego-sshd/packaging | 9 ++++----- packages/docker_app_lifecycle/packaging | 2 +- packages/windows_app_lifecycle/packaging | 2 +- src/code.cloudfoundry.org/diego-ssh | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/buildpack_app_lifecycle/packaging b/packages/buildpack_app_lifecycle/packaging index 99452317e3..571d99c7d0 100644 --- a/packages/buildpack_app_lifecycle/packaging +++ b/packages/buildpack_app_lifecycle/packaging @@ -17,8 +17,8 @@ for binary in builder launcher; do ldd $binary && echo "$binary must be statically linked" && false done -tar -xzf /var/vcap/packages/diego-sshd/diego-sshd.tgz -tar -xzf /var/vcap/packages/diego-sshd/diego-sshd-windows.tgz +cp /var/vcap/packages/diego-sshd/diego-sshd . +cp /var/vcap/packages/diego-sshd/diego-sshd.exe . cp /var/vcap/packages/healthcheck/healthcheck . cp /var/vcap/packages/healthcheck/healthcheck.exe . diff --git a/packages/diego-sshd/packaging b/packages/diego-sshd/packaging index dfe6f0b46e..2d20cc720e 100644 --- a/packages/diego-sshd/packaging +++ b/packages/diego-sshd/packaging @@ -9,14 +9,13 @@ export PATH=$GOROOT/bin:$PATH CGO_ENABLED=0 go build -a -installsuffix static code.cloudfoundry.org/diego-ssh/cmd/sshd GOOS=windows CGO_ENABLED=0 go build -a -installsuffix static code.cloudfoundry.org/diego-ssh/cmd/sshd +GOOS=windows CGO_ENABLED=0 go build -o diego-sshd-external-port.exe -tags=external -a -installsuffix static code.cloudfoundry.org/diego-ssh/cmd/sshd ldd sshd && echo 'diego-sshd must be statically linked' && false -mv sshd diego-sshd -tar -czf ${BOSH_INSTALL_TARGET}/diego-sshd.tgz diego-sshd - -mv sshd.exe diego-sshd.exe -tar -czf ${BOSH_INSTALL_TARGET}/diego-sshd-windows.tgz diego-sshd.exe +cp sshd ${BOSH_INSTALL_TARGET}/diego-sshd +cp sshd.exe ${BOSH_INSTALL_TARGET}/diego-sshd.exe +cp diego-sshd-external-port.exe ${BOSH_INSTALL_TARGET} # clean up source artifacts rm -rf ${BOSH_INSTALL_TARGET}/src ${BOSH_INSTALL_TARGET}/pkg diff --git a/packages/docker_app_lifecycle/packaging b/packages/docker_app_lifecycle/packaging index cbf2111d37..64cff3008b 100644 --- a/packages/docker_app_lifecycle/packaging +++ b/packages/docker_app_lifecycle/packaging @@ -14,7 +14,7 @@ for binary in builder launcher; do ldd $binary && echo "$binary must be statically linked" && false done -tar -xzf /var/vcap/packages/diego-sshd/diego-sshd.tgz +cp /var/vcap/packages/diego-sshd/diego-sshd . cp /var/vcap/packages/healthcheck/healthcheck . tar -czf ${BOSH_INSTALL_TARGET}/docker_app_lifecycle.tgz builder launcher healthcheck diego-sshd diff --git a/packages/windows_app_lifecycle/packaging b/packages/windows_app_lifecycle/packaging index a060979d7a..94c136c659 100644 --- a/packages/windows_app_lifecycle/packaging +++ b/packages/windows_app_lifecycle/packaging @@ -2,6 +2,6 @@ set -e mkdir -p tmp tar -xzf lifecycles/windows_app_lifecycle-*.tgz -C tmp -tar -xzf /var/vcap/packages/diego-sshd/diego-sshd-windows.tgz -C tmp +cp /var/vcap/packages/diego-sshd/diego-sshd-external-port.exe tmp/diego-sshd.exe cp /var/vcap/packages/healthcheck/healthcheck-external-port.exe tmp/healthcheck.exe tar -zcf ${BOSH_INSTALL_TARGET}/windows_app_lifecycle.tgz -C tmp . diff --git a/src/code.cloudfoundry.org/diego-ssh b/src/code.cloudfoundry.org/diego-ssh index a0438f7954..84db2a18a0 160000 --- a/src/code.cloudfoundry.org/diego-ssh +++ b/src/code.cloudfoundry.org/diego-ssh @@ -1 +1 @@ -Subproject commit a0438f7954236ecfa0e8cf2ab2350ada05d611f0 +Subproject commit 84db2a18a0e36b2eda61c9554b8416a63ac24036