From d47633b638d8209784a4ebd4d29633917fb75492 Mon Sep 17 00:00:00 2001 From: Joseph Nelson Date: Tue, 12 May 2026 22:44:46 -0700 Subject: [PATCH] updated build file, package file, and dockerfile --- .gitea/workflows/build.yaml | 15 ++++++++++++++- Dockerfile | 3 +-- package.json | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index fce4c12..72f2b65 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,17 +9,30 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Log in to Gitea Registry uses: docker/login-action@v2 with: registry: gitea.nelson-household.com # Replace with your Gitea domain username: ${{ gitea.actor }} password: ${{ secrets.RUNNER_TOKEN }} + - name: Delete Old Images and Containers run: | docker ps -a -q -f "name=tcg-collectors-server" | xargs -I {} docker rm {} || true docker images --format "{{.Repository}}:{{.Tag}}" | grep "tcg-collectors-server" | xargs -I {} docker rmi {} || true + - name: Build and Push Image run: | - docker build -t gitea.nelson-household.com/hard-at-work/tcg-collectors-server/tcg-collectors-server:${{ github.sha }} . + docker build \ + --build-arg DB_HOST=${{ secrets.DB_HOST }} \ + --build-arg DB_USERNAME=${{ secrets.DB_USERNAME }} \ + --build-arg DB_PASSWORD=${{ secrets.DB_PASSWORD }} \ + --build-arg DB_PORT=${{ secrets.DB_PORT }} \ + --build-arg DB_DATABASE=${{ secrets.DB_DATABASE }} \ + -t gitea.nelson-household.com/hard-at-work/tcg-collectors-server/tcg-collectors-server:${{ github.sha }} . docker push gitea.nelson-household.com/hard-at-work/tcg-collectors-server/tcg-collectors-server:${{ github.sha }} + + - name: Execute Migrations + run: | + docker exec gitea.nelson-household.com/hard-at-work/tcg-collectors-server/tcg-collectors-server:${{ github.sha }} npm run migrate diff --git a/Dockerfile b/Dockerfile index f73827d..e302c85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,8 @@ ENV DB_PASSWORD= ENV DB_PORT= ENV DB_DATABASE= -ARG CMD WORKDIR /app COPY . . RUN npm install --force -CMD ["node", "run", "$CMD"] +CMD ["npm", "run", "start"] diff --git a/package.json b/package.json index 0dffcb8..8f82aa3 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "lint": "eslint .", "lint:fix": "eslint . --fix", "format": "prettier --config prettier.config.js --write .", - "migrations": "node ./migrations/index.js" + "migrate": "node ./migrations/index.js" }, "type": "module", "keywords": [