From 7a62e1e134f5ede5eaa7da2956c4278aba3fe010 Mon Sep 17 00:00:00 2001 From: johannchopin Date: Fri, 15 Nov 2024 21:40:29 +0100 Subject: [PATCH] feat: improve Docker DX --- Dockerfile | 14 +++++----- docker-compose.yml | 64 ++++++++++++++++++++++---------------------- website/Dockerfile | 7 +++++ website/package.json | 2 +- 4 files changed, 47 insertions(+), 40 deletions(-) create mode 100644 website/Dockerfile diff --git a/Dockerfile b/Dockerfile index f2200ea..5df3bcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM node:17-alpine -WORKDIR /app -COPY ./package.json ./yarn.lock /app/ -RUN npm install -COPY . /app/ -EXPOSE 5000 -CMD ["npm", "run", "serve"] +FROM node:alpine +WORKDIR /app +COPY ./package.json ./yarn.lock /app/ +RUN npm install +COPY . /app/ +EXPOSE 5000 +CMD ["npm", "run", "serve"] diff --git a/docker-compose.yml b/docker-compose.yml index f91eec7..7870295 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,32 +1,32 @@ -version: "3" -services: - app: - image: johannchopin/stackoverflow-readme-profile - restart: always - ports: - - "5000:5000" - container_name: stackoverflow-readme-profile - depends_on: - - db - environment: - - DB_PORT=${DB_PORT} - - DB_HOST=${DB_HOST} - - DB_USERNAME=${DB_USERNAME} - - DB_PASSWORD=${DB_PASSWORD} - - DB_DATABASE=${DB_DATABASE} - - db: - image: postgres - restart: always - container_name: postgres-db - environment: - - POSTGRES_USER=${DB_USERNAME} - - POSTGRES_PASSWORD=${DB_PASSWORD} - - POSTGRES_DB=${DB_DATABASE} - ports: - - "5432:5432" - volumes: - - pgdata:/var/lib/postgresql/data - -volumes: - pgdata: +services: + app: + build: + context: . + restart: always + ports: + - "5000:5000" + container_name: stackoverflow-readme-profile + depends_on: + - db + environment: + - DB_PORT=${DB_PORT} + - DB_HOST=db + - DB_USERNAME=${DB_USERNAME} + - DB_PASSWORD=${DB_PASSWORD} + - DB_DATABASE=${DB_DATABASE} + + db: + image: postgres + restart: always + container_name: postgres-db + environment: + - POSTGRES_USER=${DB_USERNAME} + - POSTGRES_PASSWORD=${DB_PASSWORD} + - POSTGRES_DB=${DB_DATABASE} + ports: + - "5432:5432" + volumes: + - pgdata:/var/lib/postgresql/data + +volumes: + pgdata: diff --git a/website/Dockerfile b/website/Dockerfile new file mode 100644 index 0000000..c41ca59 --- /dev/null +++ b/website/Dockerfile @@ -0,0 +1,7 @@ +FROM node:alpine +WORKDIR /app +COPY ./package.json ./yarn.lock /app +RUN yarn +COPY . /app/ +EXPOSE 3000 +CMD ["npm", "run", "dev"] diff --git a/website/package.json b/website/package.json index de39c45..92383b3 100644 --- a/website/package.json +++ b/website/package.json @@ -2,7 +2,7 @@ "name": "website", "version": "0.0.1", "scripts": { - "dev": "vite dev --port 3000", + "dev": "vite dev --port 3000 --host", "build": "vite build", "preview": "vite preview", "check": "svelte-check --tsconfig ./tsconfig.json",