From 2d8a205c44f1864bd73df9430b4b30f91f8bcd32 Mon Sep 17 00:00:00 2001
From: Lee Brown <lee@geeksinthewoods.com>
Date: Tue, 6 Aug 2019 14:14:37 -0800
Subject: [PATCH] resolve build permisison errors for devops

---
 .gitlab-ci.yml                | 6 +++---
 tools/devops/scripts/build.sh | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48cb489..11963a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,17 +32,17 @@ cache:
 .build_tmpl: &build_tmpl
   <<: *job_tmpl
   script:
-    - 'devops build -service=${SERVICE} -project=${PROJECT_NAME} -env=${TARGET_ENV}'
+    - './devops build -service=${SERVICE} -project=${PROJECT_NAME} -env=${TARGET_ENV}'
 
 .deploy_tmpl: &deploy_tmpl
   <<: *job_tmpl
   script:
-    - 'devops deploy -service=${SERVICE} -project=${PROJECT_NAME} -env=${TARGET_ENV} -enable_https=${ENABLE_HTTPS} -enable_elb=${ENABLE_ELB} -primary_host=${PRIMARY_HOST} -host_names=${HOST_NAMES} -private_bucket=${S3_BUCKET_PRIVATE} -public_bucket=${S3_BUCKET_PUBLIC} -public_bucket_cloudfront=${S3_BUCKET_PUBLIC_CLOUDFRONT}  -static_files_s3=${STATIC_FILES_S3} -static_files_img_resize=${STATIC_FILES_IMG_RESIZE}'
+    - './devops deploy -service=${SERVICE} -project=${PROJECT_NAME} -env=${TARGET_ENV} -enable_https=${ENABLE_HTTPS} -enable_elb=${ENABLE_ELB} -primary_host=${PRIMARY_HOST} -host_names=${HOST_NAMES} -private_bucket=${S3_BUCKET_PRIVATE} -public_bucket=${S3_BUCKET_PUBLIC} -public_bucket_cloudfront=${S3_BUCKET_PUBLIC_CLOUDFRONT}  -static_files_s3=${STATIC_FILES_S3} -static_files_img_resize=${STATIC_FILES_IMG_RESIZE}'
 
 .migrate_tmpl: &migrate_tmpl
   <<: *job_tmpl
   script:
-    - 'devops migrate -project=${PROJECT_NAME} -env=${TARGET_ENV}'
+    - './devops migrate -project=${PROJECT_NAME} -env=${TARGET_ENV}'
 
 db:migrate:dev:
   <<: *migrate_tmpl
diff --git a/tools/devops/scripts/build.sh b/tools/devops/scripts/build.sh
index a77d478..71ec955 100755
--- a/tools/devops/scripts/build.sh
+++ b/tools/devops/scripts/build.sh
@@ -20,7 +20,4 @@ if [[ $doPush == 1 ]]; then
     docker push ${releaseImg}
 fi
 
-binPath=$GOROOT/bin/devops
-echo "installing to: ${binPath}"
-
-docker run --rm --entrypoint=cat ${releaseImg} /devops > $binPath
+docker run --rm --entrypoint=cat ${releaseImg} /devops > devops