Dev (#6)

* fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Write README * Write README * fix mkdir * fix path * fix deploy.yml * fix deploy.yml * fix deploy.yml * fix deploy.yml * fix Make * fix Make * fix Make * fix Make * fix Make * fix Make * fix Make * Избавился от sudo для make
SergTyapkin · Jan 29, 2024 · 5be702c · 5be702c
1 parent e96092e
commit 5be702c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 40 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,4 +22,4 @@ jobs:
         key: ${{ secrets.SSH_DEPLOY_KEY }}
         script: |
           cd ${{ vars.PROJECT_PATH }}
-          sudo make update
+          make update
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 #TAG ?= $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
-include docker-deploy/.env
+-include ./docker-deploy/.env
 
 generate-certs:
 	cd docker-deploy && \
@@ -17,7 +17,7 @@ set-auto-renewing-certs:
 	echo "" && \
 	echo "0 0 1 * * cd $$(pwd) && make run renew-certs >> ./certbot-renew.log" && \
 	echo "" && \
-	echo "Copy that command and press [Enter]. Then add this string in end of opened file." && \
+	echo "Copy that command and [press Enter]. Then add this string in end of opened file." && \
 	read ENTER
 	crontab -e
 
@@ -26,6 +26,10 @@ run:
 	docker compose down && \
 	docker compose up -d nginx
 
+down:
+	cd docker-deploy && \
+	docker compose down
+
 build:
 	cd docker-deploy && \
 	docker compose build --no-cache --progress=plain nginx
@@ -64,14 +68,27 @@ setup-ci:
 	sudo cat /tmp/tmp_key.pub >> ~/.ssh/authorized_keys
 	echo '' && \
 	echo 'Add this private rsa key secret deploy variables to SSH_DEPLOY_KEY on your github repo: ' && \
-	echo '[press Enter...]' && \
+	echo '[To see key press Enter...]' && \
 	read ENTER
 	sudo less /tmp/tmp_key
 
+set-docker-not-sudo:
+	# add user to docker group
+	getent group docker || sudo groupadd docker # Add group if not exists
+	sudo usermod -aG docker ${USER}
+	newgrp docker
+	sudo systemctl restart docker
+
 all:
 	cp --no-clobber ./docker-deploy/.env.example ./docker-deploy/.env
+	echo '' && \
+	echo 'Edit .env file. Write right DOMAIN_URL!' && \
+	echo '[press Enter...]' && \
+	read ENTER
 	nano ./docker-deploy/.env
-	make generate-scripts
+	make generate-certs
 	make set-auto-renewing-certs
+	make down
 	make setup-ci
+	sudo chmod ug+rwx -R /home/legend/vue-frontend-template/docker-deploy/certbot/
 	make update
diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@
 
 ### 1. Клонируем:
 ```SHELL
-git clone <this_repo>
+git clone [email protected]:SergTyapkin/vue-frontend-template.git
 ```
 
 ### 2. Настраиваем вообще всё.
 В самом начале нужно будет настроить `.env` файл, прописать правильный `DOMAIN_URL`
 ```SHELL
-cd <this_repo>
+cd vue-frontend-template
 make all
 ````
 

diff --git a/docker-deploy/.env.example b/docker-deploy/.env.example
@@ -1,6 +1,5 @@
 NODE_RELEASE=18
-# Nginx not alpine. Must have 'envsubst' inside
-NGINX_RELEASE=1.23.3
+NGINX_RELEASE=1.23.3-alpine
 FRONTEND_COMPOSE_NAME=frontend-compose
 API_PORT=3000
 DOMAIN_URL=your.domain