Так ну все щас уже точно все должно работать

This commit is contained in:
Алексей Скакодуб 2025-04-21 16:28:41 -04:00
parent eb6487a10a
commit 56a1749c41
7 changed files with 174 additions and 50 deletions

View File

@ -2,7 +2,7 @@ name: Deploy to Server
on:
branches:
- master
- main
jobs:
deploy:

View File

@ -1,51 +1,48 @@
services:
database:
image: postgres:17.4-alpine3.21
container_name: database
ports:
- "5432:5432"
environment:
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
#Монтируем директорию на хосте, чтобы при повторных "docker-compose up" таблицы с нашими данными сохранялись
volumes:
- /database:/var/lib/postgresql/data
cpus: '0.15'
mem_limit: 256M
healthcheck:
test: ["CMD-SHELL", "pg_isready -U admin -WebSite"]
interval: 5s
timeout: 5s
retries: 5
webserver:
image: nginx:1.27.4-alpine
container_name: webserver
container_name: webserver1.1
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
- /home/apotheosis/projectWeb:/usr/share/nginx/html
- /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
server:
image: docker.gitea.com/gitea:1.23.7
container_name: gitea
environment:
- USER_UID=1000
- USER_GID=1000
- GITEAdatabaseDB_TYPE=postgres
- GITEAdatabaseHOST=db:5432
- GITEAdatabaseNAME=gitea
- GITEAdatabaseUSER=gitea
- GITEAdatabasePASSWD=gitea
restart: always
depends_on:
- database
- backend
cpus: '0.15'
mem_limit: 256M
backend:
image: python:3.9
container_name: backend_part
ports:
- "5000:5000"
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
- /home/apotheosis/gitea:/data
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
ports:
- "3000:3000"
- "222:22"
depends_on:
- db
db:
image: docker.io/library/postgres:14
restart: always
environment:
- POSTGRES_USER=gitea
- POSTGRES_PASSWORD=gitea
- POSTGRES_DB=gitea
volumes:
- /home/apotheosis/postgres:/var/lib/postgresql/data

View File

@ -1,10 +1,10 @@
services:
runner-1:
image: gitea/act_runner:nightly
image: gitea/act_runner:latest
restart: always
environment:
- 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
volumes:
- ./runner-1/config.yaml:/runner/config.yaml

View 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

View 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 как было
}
}
}

View 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;

View 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;