Update remote command. Transfer archive.

Author: alex-ac

entrypoint.sh

@@ -5,24 +5,28 @@ log() {
   echo ">> [local]" $@
 }
 
-log "Packing workspace into archive to transfer onto remote machine."
-tar cjvf /tmp/workspace.tar.bz2 --exclude .git .
-
-log "Launching ssh agent."
-eval `ssh-agent -s`
 cleanup() {
+  set +e
   log "Killing ssh agent."
   ssh-agent -k
+  log "Removing workspace archive."
+  rm -f /tmp/workspace.tar.bz2
 }
 trap cleanup EXIT
 
+log "Packing workspace into archive to transfer onto remote machine."
+tar cjvf /tmp/workspace.tar.bz2 --exclude .git .
+
+log "Launching ssh agent."
+eval `ssh-agent -s`
+
 ssh-add <(echo "$SSH_PRIVATE_KEY")
 
 remote_command=<< EOF
 set -e
 
 log() {
-  echo ">> [remote]" $@
+  echo ">> [remote]" \$@
 }
 
 cleanup() {
@@ -31,20 +35,21 @@ cleanup() {
 }
 
 log "Creating workspace directory..."
-mkdir "$$HOME/workspace"
+mkdir "\$HOME/workspace"
 trap cleanup EXIT
 
 log "Unpacking workspace..."
-tar -C "$$HOME/workspace" xjv
+tar -C "\$HOME/workspace" xjv
 
 log "Launching docker-compose..."
 COMPOSE_PROJECT="$DOCKER_COMPOSE_PREFIX"
 COMPOSE_FILENAME="$DOCKER_COMPOSE_FILENAME"
-cd $$HOME/workspace
+cd \$HOME/workspace
 docker-compose up -d
 EOF
 
 echo ">> [local] Connecting to remote host."
 ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
   "$SSH_USER@$SSH_HOST" -p "$SSH_PORT" \
-  "$remote_command"
+  "$remote_command" \
+  < /tmp/workspace.tar.bz2