From ca65e58b01870829f701a5fcac80a76f1589b191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0smail=20Karsl=C4=B1?= <17887754+ismailkarsli@users.noreply.github.com> Date: Sun, 27 Aug 2023 15:52:09 +0000 Subject: [PATCH] build: removed compose files and changed docker port settings --- Dockerfile | 12 +++--------- docker-compose.override.yml | 14 -------------- docker-compose.prod.yml | 12 ------------ docker-compose.yml | 11 ----------- package.json | 1 - vite.config.ts | 13 ++++++------- 6 files changed, 9 insertions(+), 54 deletions(-) delete mode 100644 docker-compose.override.yml delete mode 100644 docker-compose.prod.yml delete mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index b505a227..95113ea4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM node:18-alpine as builder -RUN mkdir -p /usr/src/app WORKDIR /usr/src/app +ENV NODE_ENV=production +ENV PORT=9494 COPY package.json package-lock.json ./ RUN npm ci @@ -11,19 +12,12 @@ RUN npm run build FROM node:18-alpine as production -RUN mkdir -p /usr/src/app WORKDIR /usr/src/app -ENV NODE_ENV=production - COPY --from=builder /usr/src/app/build ./build COPY package.json package-lock.json ./ - RUN npm ci --omit dev - RUN mkdir -p ./config -RUN ln -s /usr/src/app/config /config - -CMD [ "npm", "run", "deploy" ] +CMD [ "npm", "run", "preview" ] diff --git a/docker-compose.override.yml b/docker-compose.override.yml deleted file mode 100644 index 93804fea..00000000 --- a/docker-compose.override.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3.8' - -name: reiverr - -services: - reiverr-frontend: - volumes: - - ./:/usr/src/app/ - - /usr/src/app/node_modules - build: - context: . - target: development - ports: - - 5173:5173 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml deleted file mode 100644 index 474610cd..00000000 --- a/docker-compose.prod.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: '3.8' - -name: reiverr-prod - -services: - reiverr-frontend: - container_name: reiverr-prod - build: - context: . - target: production - ports: - - 9494:9494 diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index e1bb6cfa..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3.8' - -name: reiverr-dev - -services: - reiverr-frontend: - container_name: reiverr-dev - image: ghcr.io/aleksilassila/reiverr:latest - restart: unless-stopped - volumes: - - ./config:/config diff --git a/package.json b/package.json index 77ddb0bb..ecd06b69 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "dev": "vite dev --host", "build": "vite build", "preview": "vite preview", - "deploy": "PORT=9494 NODE_ENV=production node build/", "test": "playwright test", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", diff --git a/vite.config.ts b/vite.config.ts index e654640c..8f9e3904 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,16 +1,15 @@ import { sveltekit } from '@sveltejs/kit/vite'; import { defineConfig } from 'vitest/config'; -// import * as pkg from './package.json'; -export default defineConfig({ +export default defineConfig(() => ({ plugins: [sveltekit()], - // define: { - // PKG: pkg - // }, + server: { + port: Number(process.env.PORT || 9494) + }, test: { include: ['src/**/*.{test,spec}.{js,ts}'] }, ssr: { external: ['reflect-metadata'] - } -}); + }, +}));