Merge branch 'master' into adjust_env_file

squadster · Dec 4, 2020 · 2229fcf · 2229fcf
2 parents 955ed40 + 43c8e96
commit 2229fcf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.env.sample b/.env.sample
@@ -16,7 +16,6 @@ DB_PASSWORD=squadster
 
 NGINX_PORT=80
 
-INSTANCE_KEY_FILE=squadster.pem
 INSTANCE_USER=
 INSTANCE_IP=
 APP_ENV=production

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
   api:
     image: "docker.pkg.github.com/$GITHUB_ORGANIZATION/$API_GITHUB_REPO/$API_GITHUB_PACKAGE:$RELEASE_VERSION"
     command: bash -c "bin/squadster start"
+    restart: on-failure
     depends_on:
       - db
 
@@ -28,6 +29,7 @@ services:
     environment:
       ELASTICSEARCH_HOST: "${ELASTICSEARCH_HOST}"
       ELASTICSEARCH_PORT: "${ELASTICSEARCH_PORT}"
+    restart: on-failure
     depends_on:
       - db
 

diff --git a/scripts/connect.sh b/scripts/connect.sh
@@ -4,4 +4,4 @@
 
 source .env
 
-ssh -i $INSTANCE_KEY_FILE $INSTANCE_USER@$INSTANCE_IP
+ssh $INSTANCE_USER@$INSTANCE_IP
diff --git a/scripts/console.sh b/scripts/console.sh
@@ -4,4 +4,4 @@
 
 source .env
 
-ssh -i $INSTANCE_KEY_FILE -t $INSTANCE_USER@$INSTANCE_IP "docker exec -it \$(docker ps | grep -o \"production_api_.*\") bin/squadster remote"
+ssh -t $INSTANCE_USER@$INSTANCE_IP "docker exec -it \$(docker ps | grep -o \"production_api_.*\") bin/squadster remote"
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -4,12 +4,12 @@
 
 # execute command on server
 execute() {
-  ssh -i $INSTANCE_KEY_FILE $INSTANCE_USER@$INSTANCE_IP -T $@
+  ssh $INSTANCE_USER@$INSTANCE_IP -T $@
 }
 
 # send file to app directory
 transfer() {
-  scp -r -i $INSTANCE_KEY_FILE $1 $INSTANCE_USER@$INSTANCE_IP:$2
+  scp -r $1 $INSTANCE_USER@$INSTANCE_IP:$2
 }
 
 source .env
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		source .env

		ssh -i $INSTANCE_KEY_FILE $INSTANCE_USER@$INSTANCE_IP
		ssh $INSTANCE_USER@$INSTANCE_IP