Skip to content

Bump diego-ssh submodule and update packaging scripts #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Bump diego-ssh submodule and update packaging scripts #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/buildpack_app_lifecycle/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand Down
9 changes: 4 additions & 5 deletions packages/diego-sshd/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/docker_app_lifecycle/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/windows_app_lifecycle/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/diego-ssh
Open in desktop
Submodule diego-ssh updated 7 files
+30 −0 cmd/sshd/helpers_external_port_test.go
+25 −0 cmd/sshd/helpers_internal_port_test.go
+2 −0 cmd/sshd/main_external_port.go
+1 −1 cmd/sshd/main_internal_port.go
+1 −2 cmd/sshd/main_suite_test.go
+1 −3 cmd/sshd/main_test.go
+12 −34 cmd/sshd/main_windows_test.go