From ec3b861c69c4ddde58bf0ba198ec3e8bb7c33933 Mon Sep 17 00:00:00 2001 From: a-sync Date: Sat, 7 Sep 2024 13:39:48 +0200 Subject: [PATCH] upd. Dockerfile & release actions - omit dev deps from lxc image - add linux/arm64 release - bump version - upd. gamedig - audit fix. --- .github/workflows/release.yml | 5 +++-- Dockerfile | 2 +- package-lock.json | 19 ++++++++++--------- package.json | 4 ++-- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bed5ad2..0b98326 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@5139682d94efc37792e6b54386b5b470a68a4737 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -32,9 +32,10 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 187e2f3..a6223b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN rm -rf node_modules FROM base COPY --from=builder /app /app -RUN npm ci +RUN npm ci --omit=dev EXPOSE 8080 CMD [ "npm", "run", "start" ] diff --git a/package-lock.json b/package-lock.json index 2b5c276..a8387c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,19 @@ { "name": "game-server-watcher", - "version": "3.1.16", + "version": "3.1.18", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "game-server-watcher", - "version": "3.1.16", + "version": "3.1.18", "license": "AGPL-3.0-or-later", "dependencies": { "@slack/bolt": "^3.17.1", "axios": "^1.6.5", "discord.js": "^14.12.1", "dotenv": "^16.3.2", - "gamedig": "^5.0.0", + "gamedig": "^5.1.3", "grammy": "^1.20.3", "lowdb": "^6.1.1", "mustache": "^4.2.0" @@ -867,9 +867,10 @@ } }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -2211,9 +2212,9 @@ } }, "node_modules/gamedig": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-5.1.2.tgz", - "integrity": "sha512-YvuTM2kE3uNQwSP15lIL6ycjK9TVNMiRTKs1cxaSjIOfwOo+/fCRigftar/z6ABi4JqDJkh9NlMGIWZoP7gVYQ==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-5.1.3.tgz", + "integrity": "sha512-ECksJC4idM3a+P+a+j9/XHcPOsP4DUrwowK38QucDQ4x5T7mQDWErY2n8NE4kV4HKjCq16ifNMAEt+/nyCKWog==", "license": "MIT", "dependencies": { "cheerio": "1.0.0-rc.12", diff --git a/package.json b/package.json index 0219a9b..50427f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "game-server-watcher", - "version": "3.1.16", + "version": "3.1.18", "description": "A simple discord/telegram/slack bot that can be hosted on a free service to monitor your game servers and players in style. 😎", "exports": "./dist/server.js", "type": "module", @@ -28,7 +28,7 @@ "axios": "^1.6.5", "discord.js": "^14.12.1", "dotenv": "^16.3.2", - "gamedig": "^5.0.0", + "gamedig": "^5.1.3", "grammy": "^1.20.3", "lowdb": "^6.1.1", "mustache": "^4.2.0"