diff --git a/.gitea/workflows/deploy-nas.yml b/.gitea/workflows/deploy-nas.yml index 5636b11..54b9fdc 100644 --- a/.gitea/workflows/deploy-nas.yml +++ b/.gitea/workflows/deploy-nas.yml @@ -15,29 +15,27 @@ jobs: uses: actions/checkout@v4 - name: Generate package-lock.json - run: npm install + run: npm ci --omit=dev - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build Docker image + - name: Login to Gitea Container Registry + uses: docker/login-action@v3 + with: + registry: tea.kleptonix.com + username: ${{ secrets.TEA_USERNAME }} + password: ${{ secrets.TEA_TOKEN }} + + - name: Build and Push Docker image uses: docker/build-push-action@v5 with: context: . - push: false - load: true - tags: kekbot:latest + push: true + tags: tea.kleptonix.com/hllywluis/kekbot.js:latest cache-from: type=gha cache-to: type=gha,mode=max - - name: Save Docker image - run: docker save kekbot:latest -o kekbot.tar - - - name: Install SSH dependencies - run: | - sudo apt-get update - sudo apt-get install -y sshpass - - name: Generate .env file run: | cat > .env << EOF @@ -55,13 +53,12 @@ jobs: sshpass -p "$SSH_PASSWORD" ssh -o StrictHostKeyChecking=no hllywluis@luis-nas.lan "mkdir -p /mnt/kCloud/Home/hllywluis/kekbot" # Copy Docker files (without .env, it's generated separately) - sshpass -p "$SSH_PASSWORD" scp -o StrictHostKeyChecking=no docker-compose.yml Dockerfile kekbot.tar hllywluis@luis-nas.lan:/mnt/kCloud/Home/hllywluis/kekbot/ - sshpass -p "$SSH_PASSWORD" scp -o StrictHostKeyChecking=no .env hllywluis@luis-nas.lan:/mnt/kCloud/Home/hllywluis/kekbot/ + sshpass -p "$SSH_PASSWORD" scp -o StrictHostKeyChecking=no docker-compose.yml .env hllywluis@luis-nas.lan:/mnt/kCloud/Home/hllywluis/kekbot/ - # Load Docker image and deploy + # Pull Docker image and deploy sshpass -p "$SSH_PASSWORD" ssh -o StrictHostKeyChecking=no hllywluis@luis-nas.lan << 'EOF' cd /mnt/kCloud/Home/hllywluis/kekbot - docker load -i kekbot.tar docker compose down || true + docker pull tea.kleptonix.com/_/hllywluis/kekbot.js:latest docker compose up -d EOF \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 4805fbb..32d1541 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,7 @@ version: '3.8' services: kekbot: - build: - context: . - dockerfile: Dockerfile + image: tea.kleptonix.com/hllywluis/kekbot.js:latest container_name: kekbot restart: unless-stopped env_file: