From d3108359d0a21516e1e4fdb2b674eb0b5bb41cc3 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 28 Jun 2026 13:26:09 +0200 Subject: [PATCH] try to deploy en nas --- .env.example | 6 +++--- .gitea/workflows/build.yml | 5 ++++- docker-compose.prod.yml | 36 +++++------------------------------- 3 files changed, 12 insertions(+), 35 deletions(-) diff --git a/.env.example b/.env.example index dec238b..2545b8d 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -# Node +# Node TZ=UTC PORT=3333 HOST=localhost @@ -6,7 +6,7 @@ NODE_ENV=development # App LOG_LEVEL=info -APP_KEY=hzjnqY1-CfioBl2N-mncw4hty_66rB7V +APP_KEY= APP_URL=http://localhost:3333 # Session @@ -18,4 +18,4 @@ DB_HOST=127.0.0.1 DB_PORT=3306 DB_USER=admin DB_PASSWORD=password -DB_DATABASE=pc_builderv2 +DB_DATABASE=pc_builderv2 \ No newline at end of file diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 63ddfde..c0f4b7e 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -39,14 +39,17 @@ jobs: IMAGE=192.168.1.39:3000/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]') docker build -t ${IMAGE}:latest -t ${IMAGE}:${{ github.sha }} . docker push ${IMAGE}:latest - docker push ${IMAGE}:${{ github.sha }} + docker push ${{ github.sha }} - name: Deploy on NAS run: | apk add --no-cache openssh-client sshpass cat docker-compose.prod.yml | sshpass -p "${{ secrets.NASPASS }}" ssh -o StrictHostKeyChecking=no Stude12@192.168.1.39 "cat > /volume1/docker/pc_builder/docker-compose.prod.yml" + cat .env.production | sshpass -p "${{ secrets.NASPASS }}" ssh -o StrictHostKeyChecking=no Stude12@192.168.1.39 "cat > /volume1/docker/pc_builder/.env" + cat deploy/setup-db.sh | sshpass -p "${{ secrets.NASPASS }}" ssh -o StrictHostKeyChecking=no Stude12@192.168.1.39 "cat > /volume1/docker/pc_builder/setup-db.sh" sshpass -p "${{ secrets.NASPASS }}" ssh -o StrictHostKeyChecking=no Stude12@192.168.1.39 " cd /volume1/docker/pc_builder && + echo '${{ secrets.NASPASS }}' | sudo -S /usr/bin/bash setup-db.sh && echo '${{ secrets.NASPASS }}' | sudo -S /usr/bin/docker compose -f docker-compose.prod.yml pull && echo '${{ secrets.NASPASS }}' | sudo -S /usr/bin/docker compose -f docker-compose.prod.yml up -d --remove-orphans " diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 87c8b58..55d5bef 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,6 +1,6 @@ services: pc-builder: - image: 192.168.1.39:3000/Stude12/pc_builder:latest + image: 192.168.1.39:3000/stude12/pc_builder:latest container_name: pc-builder restart: unless-stopped ports: @@ -14,41 +14,15 @@ services: - APP_URL=${APP_URL} - SESSION_DRIVER=cookie - DB_CONNECTION=mysql - - DB_HOST=mysql + - DB_HOST=host.docker.internal - DB_PORT=3306 - DB_USER=${DB_USER:-pcbuilder} - DB_PASSWORD=${DB_PASSWORD} - - DB_DATABASE=${DB_DATABASE:-pc_builderv2} + - DB_DATABASE=${DB_DATABASE:-pc_builder} + extra_hosts: + - "host.docker.internal:host-gateway" volumes: - uploads:/app/uploads - depends_on: - mysql: - condition: service_healthy - networks: - - pc-builder - - mysql: - image: mysql/mysql-server:8.0.32 - container_name: pc-builder-mysql - restart: unless-stopped - environment: - MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD} - MYSQL_DATABASE: ${DB_DATABASE:-pc_builderv2} - MYSQL_USER: ${DB_USER:-pcbuilder} - MYSQL_PASSWORD: ${DB_PASSWORD} - volumes: - - mysql_data:/var/lib/mysql - healthcheck: - test: ['CMD', 'mysqladmin', 'ping', '-p${DB_ROOT_PASSWORD}'] - retries: 10 - timeout: 5s - networks: - - pc-builder volumes: - mysql_data: uploads: - -networks: - pc-builder: - driver: bridge