From ce52341ad8aa984acb20a985f7bbb0dd5a64305e Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:33:46 +0100 Subject: [PATCH] refactor: Move server into its own folder --- Dockerfile => server/Dockerfile | 0 bun.lockb => server/bun.lockb | Bin package.json => server/package.json | 0 {src => server/src}/index.ts | 0 {src => server/src}/middlewares/real-ip.ts | 0 {src => server/src}/routes/port.ts | 0 {src => server/src}/utils/connect-to-address.ts | 0 {src => server/src}/utils/timeout.ts | 0 tsconfig.json => server/tsconfig.json | 0 upload_to_server.sh | 10 +++++----- 10 files changed, 5 insertions(+), 5 deletions(-) rename Dockerfile => server/Dockerfile (100%) rename bun.lockb => server/bun.lockb (100%) rename package.json => server/package.json (100%) rename {src => server/src}/index.ts (100%) rename {src => server/src}/middlewares/real-ip.ts (100%) rename {src => server/src}/routes/port.ts (100%) rename {src => server/src}/utils/connect-to-address.ts (100%) rename {src => server/src}/utils/timeout.ts (100%) rename tsconfig.json => server/tsconfig.json (100%) diff --git a/Dockerfile b/server/Dockerfile similarity index 100% rename from Dockerfile rename to server/Dockerfile diff --git a/bun.lockb b/server/bun.lockb similarity index 100% rename from bun.lockb rename to server/bun.lockb diff --git a/package.json b/server/package.json similarity index 100% rename from package.json rename to server/package.json diff --git a/src/index.ts b/server/src/index.ts similarity index 100% rename from src/index.ts rename to server/src/index.ts diff --git a/src/middlewares/real-ip.ts b/server/src/middlewares/real-ip.ts similarity index 100% rename from src/middlewares/real-ip.ts rename to server/src/middlewares/real-ip.ts diff --git a/src/routes/port.ts b/server/src/routes/port.ts similarity index 100% rename from src/routes/port.ts rename to server/src/routes/port.ts diff --git a/src/utils/connect-to-address.ts b/server/src/utils/connect-to-address.ts similarity index 100% rename from src/utils/connect-to-address.ts rename to server/src/utils/connect-to-address.ts diff --git a/src/utils/timeout.ts b/server/src/utils/timeout.ts similarity index 100% rename from src/utils/timeout.ts rename to server/src/utils/timeout.ts diff --git a/tsconfig.json b/server/tsconfig.json similarity index 100% rename from tsconfig.json rename to server/tsconfig.json diff --git a/upload_to_server.sh b/upload_to_server.sh index 1662c1a..2537274 100755 --- a/upload_to_server.sh +++ b/upload_to_server.sh @@ -1,9 +1,9 @@ ip=$1 user=$2 -docker buildx build --platform linux/amd64 . --tag amiopen:latest -docker save -o amiopen.tar amiopen:latest - -scp amiopen.tar $user@$ip:~/amiopen/amiopen.tar -ssh $user@$ip "cd ~/amiopen && docker container stop amiopen && docker container rm amiopen && docker load -i amiopen.tar && docker compose up -d" +cd server && + docker buildx build --platform linux/amd64 . --tag amiopen:latest && + docker save -o amiopen.tar amiopen:latest && + scp amiopen.tar $user@$ip:~/amiopen/amiopen.tar && + ssh $user@$ip "cd ~/amiopen && docker container stop amiopen && docker container rm amiopen && docker load -i amiopen.tar && docker compose up -d"