fix make command

usernaimandrey · Oct 13, 2023 · bf57371 · bf57371
1 parent e82d13c
commit bf57371
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Dockerfile.production b/Dockerfile.production
@@ -37,6 +37,7 @@ RUN APP_HOST=example.test NODE_ENV=production RAILS_ENV=production SECRET_KEY_BA
 ENV DOCKER_CHANNEL stable
 ENV DOCKER_VERSION 20.10.21
 ENV DISABLE_SPRING 1
+ENV SECRET_KEY_BASE=jopa
 
 # RUN curl -fsSL "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" \
   # | tar -xzC /usr/local/bin --strip=1 docker/docker

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ setup:
 	# bin/rails db:seed
 	make db-reset
 	yarn install
-	RAILS_ENV=test NODE_OPTIONS='--openssl-legacy-provider' bin/rails assets:precompile
+	NODE_OPTIONS='--openssl-legacy-provider' bin/rails assets:precompile
 
 prepare-env:
 	cp -n .env.example .env || true
@@ -53,9 +53,11 @@ test:
 	bin/rails test
 
 setup-ci:
-	make setup
-	# yarn install
-	# RAILS_ENV=test NODE_OPTIONS='--openssl-legacy-provider' bin/rails assets:precompile
+	make prepare-env	
+	bin/setup
+	make db-reset
+	yarn install
+	RAILS_ENV=test NODE_OPTIONS='--openssl-legacy-provider' bin/rails assets:precompile
 
 ci-check:
 	make setup-ci

diff --git a/ansible/Makefile b/ansible/Makefile
@@ -2,4 +2,4 @@ setup:
 	ansible-playbook setup.yml -i inventory.ini -u andrey
 
 deploy:
-	ansible-playbook deploy.yml -i inventory.ini -vv --extra-vars "version=v3" -u andrey
+	ansible-playbook deploy.yml -i inventory.ini -vv --extra-vars "version=v4" -u andrey
diff --git a/ansible/inventory.ini b/ansible/inventory.ini
@@ -1,2 +1,4 @@
+; localhost ansible_connection=local
+
 [app]
-62.84.118.54
+51.250.9.130
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
@@ -1 +1 @@
-l5AosraATayY85/S03s2wwqudqJ/Fn7pCfgcHLHzEDgptpVgCsg42QYbILH5d/e1dObSbxiNvCfB25zQOFZCrs1cdcuXId+q9kuQQxTooB6ZKAmDexBqYDE05ncqedswwF5kMm8usMBAwzT4qgqvqXRpqI0jnVyeskp541PTnlPinYCz565ea+MUQy4GzXcLS2/i+jSvKMBMrqqCd8Bs+fx4SCjYRKe9+O/2JzqBZozHzrMEwn3I7UTJ15KSQbmq4hCPuIBuQGTcDjRDa+x+AN73IA+vxHrVEuSfh7V7fKe7Xku1T830b8CwSlmZynuEPL/GSAKh1mAMdd3N/4HY9ES3q7r5Ej8aLEtP6ATaUIprj+U86zzeEqIjWLrlzAMkzJRFFKR3cFdERfxbh75Bk3+3ntdMb2qojULi--qA/ISuYM3D8P6E5Q--gZCyRvT9B8vPMnxTvXgUGw==
+/+pQkfzXpaIZuZNPuC3SmPoW2TQB52vCEwQRG6k1wSxzef1SBcDYeHhTdnYi2121gknMHc/qNEzz6HEU8aXPrAuDs8gOuGJgtil+d2uy2g05dREib5z0qb1MZ977Z4VZLqAFu51L7GV80LGBMXKh3vdiqV+DbbMzD7+vPjL065W8gprwXC7vOroacg6f5wzYUltjWQrSsS87ldx0dpCUqhNkLV4z52vb+oRqnh720FMtsscpRfzKBCKaQMJ69hAxdQbLf7TonRcN2n0ZgkDv+HGFFrjfoQtfXG23tyB7FpE4ZUkbCwkGc2GmqEALTZC309hMwvDhekeFpjUUB7HZ6HM3Sn5GOZv7L6AmOATAJifA38yee2xZ9Gjr86Hu1eL5J3pjnKRU+9a4jA1x2xJLNbOmBaisnbcPNJj1--s2RDQJNbv70WySQW--uud0dIpJrjOTjOhIpxIcBA==
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		l5AosraATayY85/S03s2wwqudqJ/Fn7pCfgcHLHzEDgptpVgCsg42QYbILH5d/e1dObSbxiNvCfB25zQOFZCrs1cdcuXId+q9kuQQxTooB6ZKAmDexBqYDE05ncqedswwF5kMm8usMBAwzT4qgqvqXRpqI0jnVyeskp541PTnlPinYCz565ea+MUQy4GzXcLS2/i+jSvKMBMrqqCd8Bs+fx4SCjYRKe9+O/2JzqBZozHzrMEwn3I7UTJ15KSQbmq4hCPuIBuQGTcDjRDa+x+AN73IA+vxHrVEuSfh7V7fKe7Xku1T830b8CwSlmZynuEPL/GSAKh1mAMdd3N/4HY9ES3q7r5Ej8aLEtP6ATaUIprj+U86zzeEqIjWLrlzAMkzJRFFKR3cFdERfxbh75Bk3+3ntdMb2qojULi--qA/ISuYM3D8P6E5Q--gZCyRvT9B8vPMnxTvXgUGw==
		/+pQkfzXpaIZuZNPuC3SmPoW2TQB52vCEwQRG6k1wSxzef1SBcDYeHhTdnYi2121gknMHc/qNEzz6HEU8aXPrAuDs8gOuGJgtil+d2uy2g05dREib5z0qb1MZ977Z4VZLqAFu51L7GV80LGBMXKh3vdiqV+DbbMzD7+vPjL065W8gprwXC7vOroacg6f5wzYUltjWQrSsS87ldx0dpCUqhNkLV4z52vb+oRqnh720FMtsscpRfzKBCKaQMJ69hAxdQbLf7TonRcN2n0ZgkDv+HGFFrjfoQtfXG23tyB7FpE4ZUkbCwkGc2GmqEALTZC309hMwvDhekeFpjUUB7HZ6HM3Sn5GOZv7L6AmOATAJifA38yee2xZ9Gjr86Hu1eL5J3pjnKRU+9a4jA1x2xJLNbOmBaisnbcPNJj1--s2RDQJNbv70WySQW--uud0dIpJrjOTjOhIpxIcBA==