From 506d1875baee473d1764d1dc069b54e1653b3486 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Thu, 12 Apr 2018 07:49:30 +0300
Subject: [PATCH] Fix deploy scripts

---
 Makefile       |  2 +-
 tools/composer |  3 ++-
 tools/dep      | 12 ++++++------
 tools/npm      |  3 ++-
 tools/sculpin  |  3 ++-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index acb17d2..8737aad 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ watch: build-assets
 deploy:
 	./tools/sculpin generate --clean --env=prod --no-interaction
 	./tools/npm run build-prod
-	deployer deploy production
+	./tools/dep deploy production
 
 rollback:
 	deployer rollback production
diff --git a/tools/composer b/tools/composer
index 43f8da1..59ff0d2 100755
--- a/tools/composer
+++ b/tools/composer
@@ -15,4 +15,5 @@ docker run \
     --volume $HOME:$HOME \
     --volume $PWD/var/docker-cache/.composer:/tmp/.composer \
     --env COMPOSER_HOME=/tmp/.composer \
-    ${PHP_IMAGE} composer "$@"
+    ${PHP_IMAGE} \
+    composer "$@"
diff --git a/tools/dep b/tools/dep
index d281757..d6aa6e4 100755
--- a/tools/dep
+++ b/tools/dep
@@ -4,12 +4,12 @@ source .env
 
 docker run \
     --rm \
-    --user "$UID" \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume /etc/group:/etc/group:ro \
-    --volume $SSH_AUTH_SOCK:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent \
-	--volume "$PWD:/srv/homepage" \
 	--interactive \
 	--tty \
-	${HOMEPAGE_IMAGE} \
+    --user "$UID:$(id -g)" \
+    --volume /etc/passwd:/etc/passwd:ro \
+    --volume /etc/group:/etc/group:ro \
+    --volume $HOME:$HOME \
+	--volume "$PWD:/srv/app" \
+	${PHP_IMAGE} \
 	dep "$@"
diff --git a/tools/npm b/tools/npm
index 8392179..6c82427 100755
--- a/tools/npm
+++ b/tools/npm
@@ -16,4 +16,5 @@ docker run \
     --volume $PWD/var/docker-cache/.npm:/tmp/.npm \
     --env npm_config_cache=/tmp/.npm \
     --workdir /srv/app \
-    ${NODE_IMAGE} npm "$@"
+    ${NODE_IMAGE} \
+    npm "$@"
diff --git a/tools/sculpin b/tools/sculpin
index 75ae4b0..289a263 100755
--- a/tools/sculpin
+++ b/tools/sculpin
@@ -11,4 +11,5 @@ docker run \
 	--volume="$PWD:/srv/app" \
 	--expose=8000 \
 	--publish=8000:8000 \
-	${PHP_IMAGE} ./vendor/bin/sculpin "$@"
+	${PHP_IMAGE} \
+	./vendor/bin/sculpin "$@"