Так ну все щас уже точно все должно работать
This commit is contained in:
parent
eb6487a10a
commit
56a1749c41
@ -2,7 +2,7 @@ name: Deploy to Server
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
|
@ -1,51 +1,48 @@
|
|||||||
services:
|
services:
|
||||||
database:
|
webserver:
|
||||||
image: postgres:17.4-alpine3.21
|
image: nginx:1.27.4-alpine
|
||||||
container_name: database
|
container_name: webserver1.1
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "80:80"
|
||||||
environment:
|
- "443:443"
|
||||||
POSTGRES_DB: ${POSTGRES_DB}
|
volumes:
|
||||||
POSTGRES_USER: ${POSTGRES_USER}
|
- /home/apotheosis/projectWeb:/usr/share/nginx/html
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
- /home/domain.crt:/etc/nginx/conf.d/domain.crt
|
||||||
|
- /home/domain.key:/etc/nginx/conf.d/domain.key
|
||||||
|
- /home//domain.conf:/etc/nginx/conf.d/default.conf
|
||||||
|
- /etc/letsencrypt/live/super-admins.online/privkey.pem:/etc/nginx/conf.d/privkey.pem
|
||||||
|
- /etc/letsencrypt/live/super-admins.online/fullchain.pem:/etc/nginx/conf.d/fullchain.pem
|
||||||
|
|
||||||
#Монтируем директорию на хосте, чтобы при повторных "docker-compose up" таблицы с нашими данными сохранялись
|
server:
|
||||||
volumes:
|
image: docker.gitea.com/gitea:1.23.7
|
||||||
- /database:/var/lib/postgresql/data
|
container_name: gitea
|
||||||
cpus: '0.15'
|
environment:
|
||||||
mem_limit: 256M
|
- USER_UID=1000
|
||||||
|
- USER_GID=1000
|
||||||
|
- GITEAdatabaseDB_TYPE=postgres
|
||||||
|
- GITEAdatabaseHOST=db:5432
|
||||||
|
- GITEAdatabaseNAME=gitea
|
||||||
|
- GITEAdatabaseUSER=gitea
|
||||||
|
- GITEAdatabasePASSWD=gitea
|
||||||
|
restart: always
|
||||||
|
|
||||||
healthcheck:
|
volumes:
|
||||||
test: ["CMD-SHELL", "pg_isready -U admin -WebSite"]
|
- /home/apotheosis/gitea:/data
|
||||||
interval: 5s
|
- /etc/timezone:/etc/timezone:ro
|
||||||
timeout: 5s
|
- /etc/localtime:/etc/localtime:ro
|
||||||
retries: 5
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
webserver:
|
- "222:22"
|
||||||
image: nginx:1.27.4-alpine
|
depends_on:
|
||||||
container_name: webserver
|
- db
|
||||||
ports:
|
|
||||||
- "80:80"
|
|
||||||
- "443:443"
|
|
||||||
volumes:
|
|
||||||
- /WebApp/frontend:/usr/share/nginx/html
|
|
||||||
- /WebApp/nginx/ssl:/etc/nginx/sites-available
|
|
||||||
- /WebApp/nginx/nginx.conf:/etc/nginx/nginx.conf
|
|
||||||
|
|
||||||
depends_on:
|
db:
|
||||||
- database
|
image: docker.io/library/postgres:14
|
||||||
- backend
|
restart: always
|
||||||
cpus: '0.15'
|
environment:
|
||||||
mem_limit: 256M
|
- POSTGRES_USER=gitea
|
||||||
backend:
|
- POSTGRES_PASSWORD=gitea
|
||||||
image: python:3.9
|
- POSTGRES_DB=gitea
|
||||||
container_name: backend_part
|
|
||||||
ports:
|
volumes:
|
||||||
- "5000:5000"
|
- /home/apotheosis/postgres:/var/lib/postgresql/data
|
||||||
volumes:
|
|
||||||
- /WebApp/backend:/media/backend
|
|
||||||
working_dir: /media/backend
|
|
||||||
command: >
|
|
||||||
sh -c "pip install -r requirements.txt && python server.py"
|
|
||||||
cpus: '0.35'
|
|
||||||
mem_limit: 256M
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
services:
|
services:
|
||||||
runner-1:
|
runner-1:
|
||||||
image: gitea/act_runner:nightly
|
image: gitea/act_runner:latest
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
- CONFIG_FILE=/runner/config.yaml
|
- CONFIG_FILE=/runner/config.yaml
|
||||||
- GITEA_INSTANCE_URL=https://super-admins.online/Aleksey_Skakodub/WebServer/
|
- GITEA_INSTANCE_URL=https://super-admins.online
|
||||||
- GITEA_RUNNER_REGISTRATION_TOKEN=WRXwMh6gi6CrF3XddpkH4mcrx8sNpnyBam0FY9gj
|
- GITEA_RUNNER_REGISTRATION_TOKEN=WRXwMh6gi6CrF3XddpkH4mcrx8sNpnyBam0FY9gj
|
||||||
volumes:
|
volumes:
|
||||||
- ./runner-1/config.yaml:/runner/config.yaml
|
- ./runner-1/config.yaml:/runner/config.yaml
|
14
gitea-runner/docker-compose.yaml
Normal file
14
gitea-runner/docker-compose.yaml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
|
services:
|
||||||
|
gitea-runner:
|
||||||
|
image: gitea/act_runner:latest
|
||||||
|
container_name: gitea-runner
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
- ./config.yaml:/runner/config.yml
|
||||||
|
- /var/gitea-runner:/data
|
||||||
|
environment:
|
||||||
|
- GITEA_INSTANCE_URL=https://super-admins.online
|
||||||
|
- GITEA_RUNNER_REGISTRATION_TOKEN=WRXwMh6gi6CrF3XddpkH4mcrx8sNpnyBam0FY9gj
|
47
nginx-compose/nginx-compose.conf
Normal file
47
nginx-compose/nginx-compose.conf
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name super-admins.ru;
|
||||||
|
return 301 https://super-admins.ru$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name super-admins.ru;
|
||||||
|
ssl_certificate /etc/letsencrypt/live/super-admins.online/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/super-admins.online/privkey.pem;
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
root /usr/share/nginx/html; # Здесь указан путь к файлам super-admins.ru
|
||||||
|
index index.html index.htm;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name super-admins.online;
|
||||||
|
return 301 https://super-admins.online$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name super-admins.online;
|
||||||
|
ssl_certificate /etc/letsencrypt/live/super-admins.online/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/super-admins.online/privkey.pem;
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://gitea:3000; # Оставил проксирование Gitea как было
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
33
nginx-compose/nginx.conf.save
Normal file
33
nginx-compose/nginx.conf.save
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name super-admins.ru;
|
||||||
|
return 301 https://super-admins.ru$request_uri;
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name super-admins.ru;
|
||||||
|
ssl_certificate /etc/nginx/sites-available/domain.crt;
|
||||||
|
ssl_certificate_key /etc/nginx/sites-available/domain.key;
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name super-admins.online;
|
||||||
|
return 301 https://super-admins.online$request_uri;
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name super-admins.online;
|
||||||
|
ssl_certificate /usr/share/nginx/html/fullchain.pem;
|
||||||
|
ssl_certificate_key /usr/share/nginx/html/privkey.pem;
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
location / {
|
||||||
|
proxy_pass http://gitea:3000;
|
33
nginx-compose/nginx.conf.save.1
Normal file
33
nginx-compose/nginx.conf.save.1
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name super-admins.ru;
|
||||||
|
return 301 https://super-admins.ru$request_uri;
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name super-admins.ru;
|
||||||
|
ssl_certificate /etc/nginx/sites-available/domain.crt;
|
||||||
|
ssl_certificate_key /etc/nginx/sites-available/domain.key;
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name super-admins.online;
|
||||||
|
return 301 https://super-admins.online$request_uri;
|
||||||
|
}
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name super-admins.online;
|
||||||
|
ssl_certificate /usr/share/nginx/html/fullchain.pem;
|
||||||
|
ssl_certificate_key /usr/share/nginx/html/privkey.pem;
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
location / {
|
||||||
|
proxy_pass http://gitea:3000;
|
Loading…
x
Reference in New Issue
Block a user