Compare commits
8 commits
astro-migr
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10500c5492 | ||
|
|
d1b5e4518a | ||
|
|
da35af4256 | ||
|
|
8b3a253269 | ||
|
|
a3fc5bc3e2 | ||
|
|
e210185342 | ||
|
|
496619e8fe | ||
|
|
a058c72537 |
3 changed files with 16 additions and 12 deletions
|
|
@ -8,21 +8,21 @@ on:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest # Метка вашего Forgejo Runner
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Deploy to VPS via SSH
|
- name: Deploy to VPS via SSH
|
||||||
uses: appleboy/ssh-action@v1.0.3
|
uses: https://github.com/appleboy/ssh-action@v1.2.5
|
||||||
with:
|
with:
|
||||||
host: ${{ secrets.VPS_HOST }}
|
host: ${{ secrets.VPS_HOST }}
|
||||||
username: ${{ secrets.VPS_USER }}
|
username: ${{ secrets.VPS_USER }}
|
||||||
key: ${{ secrets.VPS_SSH_KEY }}
|
key: ${{ secrets.VPS_SSH_KEY }}
|
||||||
port: 22
|
port: 22
|
||||||
script: |
|
script: |
|
||||||
# 1. Переходим в директорию лендинга
|
set -e
|
||||||
cd /var/www/Landing
|
cd /var/www/Landing
|
||||||
|
|
||||||
# 2. Подтягиваем свежие коммиты из Git
|
git fetch --all
|
||||||
git pull origin main
|
git reset --hard origin/${{ github.ref_name }}
|
||||||
|
|
||||||
# 3. Пересобираем Docker-образ и перезапускаем контейнер
|
docker compose build --no-cache
|
||||||
docker compose up -d --build
|
docker compose up -d --force-recreate
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
services:
|
services:
|
||||||
midcreative:
|
midcreative:
|
||||||
# Оставляем image, чтобы CI/CD мог за push/pull обновлять образ
|
|
||||||
image: midcreative:latest
|
image: midcreative:latest
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
|
|
@ -17,12 +16,13 @@ services:
|
||||||
- traefik_proxy
|
- traefik_proxy
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.midcreative.rule=Host(`midcreative.eu`) || Host(`www.midcreative.eu`)"
|
- "traefik.http.routers.midcreative.rule=Host(`midcreative.eu`)"
|
||||||
- "traefik.http.routers.midcreative.entrypoints=websecure"
|
- "traefik.http.routers.midcreative.entrypoints=websecure"
|
||||||
- "traefik.http.routers.midcreative.tls=true"
|
- "traefik.http.routers.midcreative.tls=true"
|
||||||
- "traefik.http.routers.midcreative.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.midcreative.tls.certresolver=myresolver"
|
||||||
- "traefik.http.services.midcreative.loadbalancer.server.port=4321"
|
- "traefik.http.services.midcreative.loadbalancer.server.port=4321"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
traefik_proxy:
|
traefik_proxy:
|
||||||
external: true
|
external: true
|
||||||
|
name: traefik-net
|
||||||
|
|
|
||||||
|
|
@ -51,3 +51,7 @@ const { title, description, image = FallbackImage } = Astro.props;
|
||||||
|
|
||||||
<!-- Twitter -->
|
<!-- Twitter -->
|
||||||
<meta name="twitter:card" content="summary_large_image" />
|
<meta name="twitter:card" content="summary_large_image" />
|
||||||
|
<script
|
||||||
|
defer
|
||||||
|
src="https://analytics.midcreative.eu/script.js"
|
||||||
|
data-website-id="8bb6c1a1-17df-4882-a267-ce35df273d44"></script>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue