From 542f0705e2816cddb9648f8421070a435e60f2fd Mon Sep 17 00:00:00 2001 From: Bastian Wagner Date: Thu, 12 Sep 2024 16:06:15 +0200 Subject: [PATCH] docker --- .github/workflows/main.yml | 6 +++--- api/src/app.service.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 41b1d19..0af0de7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,6 @@ jobs: install -m 600 -D /dev/null ~/.ssh/id_rsa echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa ssh-keyscan -H ${{ secrets.SERVER_HOST }} > ~/.ssh/known_hosts - # - name: connect and pull - # run: | - # ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }} "cd docker/keyvault && docker stop beantastic_api || true && docker rm keyvault || true && docker stop beantastic_client || true && docker rm beantastic_client || true && docker-compose pull && docker-compose up -d" + - name: connect and pull + run: | + ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }} "cd docker/keyvault && docker stop keyvault_client || true && docker rm keyvault_client || true && docker stop keyvault_pro_api || true && docker rm keyvault_pro_api || true && docker-compose pull && docker-compose up -d" diff --git a/api/src/app.service.ts b/api/src/app.service.ts index bbdd038..03f5396 100644 --- a/api/src/app.service.ts +++ b/api/src/app.service.ts @@ -3,6 +3,6 @@ import { Injectable } from '@nestjs/common'; @Injectable() export class AppService { getHello(): any { - return { success: true }; + return { success: true, date: new Date() }; } }