Merge remote-tracking branch 'origin/master' into dev

BingusBoingus-Developer-Team · May 7, 2024 · eafcff6 · eafcff6
2 parents 085e34e + ca25c54
commit eafcff6
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 33 deletions.
diff --git a/.github/workflows/deploy-manual.yml b/.github/workflows/deploy-manual.yml
@@ -0,0 +1,25 @@
+name: Deploy-manual
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: executing remote ssh commands using password
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          key: ${{ secrets.SERVER_KEY }}
+          passphrase: ${{ secrets.SERVER_PASSPHRASE }}
+          script_stop: true
+          script: |
+            echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
+            cd bingusboingus
+            docker compose pull
+            docker compose up -d
+
+  ###ssh sachen
+  # https://github.com/appleboy/ssh-action
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -59,6 +59,7 @@ jobs:
           passphrase: ${{ secrets.SERVER_PASSPHRASE }}
           script_stop: true
           script: |
+            echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
             cd bingusboingus
             docker compose pull
             docker compose up -d

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.8.2](https://github.com/BingusBoingus-Developer-Team/BingusBoingus/compare/v1.8.1...v1.8.2) (2024-05-07)
+
+
+### Bug Fixes
+
+* **deps:** bun lock file ([ead02c5](https://github.com/BingusBoingus-Developer-Team/BingusBoingus/commit/ead02c59f281a7cf31212a9fc56561113a92ee68))
+
+## [1.8.1](https://github.com/BingusBoingus-Developer-Team/BingusBoingus/compare/v1.8.0...v1.8.1) (2024-05-07)
+
+
+### Bug Fixes
+
+* deps issues, types, tests ([#100](https://github.com/BingusBoingus-Developer-Team/BingusBoingus/issues/100)) ([245bb9e](https://github.com/BingusBoingus-Developer-Team/BingusBoingus/commit/245bb9edc4d7cad3c5cc6c32df77e4ac3979b1c6))
+
 ## [1.8.0](https://github.com/BingusBoingus-Developer-Team/BingusBoingus/compare/v1.7.0...v1.8.0) (2024-05-07)
 
 

diff --git a/bun.lockb b/bun.lockb
diff --git a/dockerfiles/Dockerfile.prod b/dockerfiles/Dockerfile.prod
@@ -1,5 +1,5 @@
 # NestJS default dockerfile
-FROM node:16-alpine as builder
+FROM node:20-buster as builder
 
 ENV NODE_ENV build
 
@@ -16,7 +16,7 @@ RUN npm run build \
 
 # ---
 
-FROM node:16-alpine
+FROM node:20-buster
 
 ENV NODE_ENV production
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bingusboingus",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Hey look it's Bingus.... or Boingus?? OR BOTH??",
   "main": "src/main.ts",
   "scripts": {