From a07cf5b5b652cb177f2efca01e1cac589a2ed6ee Mon Sep 17 00:00:00 2001 From: Ward Truyen Date: Tue, 23 Jul 2024 14:06:47 +0200 Subject: [PATCH] upgraded deploy scripts --- Dockerfile | 4 ++-- compose.yml | 2 +- makefile | 21 ++++++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 256eaef..4cda1fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM node:lts-alpine3.20 WORKDIR /app -COPY . . +COPY src/* . RUN npm install --global serve EXPOSE 3000 -CMD [ "serve", "src/" ] +CMD [ "serve", "." ] #http://localhost:3000 diff --git a/compose.yml b/compose.yml index acc17e5..a1c2e50 100644 --- a/compose.yml +++ b/compose.yml @@ -1,4 +1,4 @@ -version: "3" +# version: "3" services: web: diff --git a/makefile b/makefile index 1fa5958..d1a6483 100644 --- a/makefile +++ b/makefile @@ -2,18 +2,25 @@ # imageName := sample-site:v1 -default: docker +default: debug -test: - @echo test1: $? - @echo test2: $0 - @echo test3: $(imageName) +debug: + serve src/ -docker: docker-build docker-run +docker: docker-compose + +docker-compose: docker-compose-up + +docker-compose-up: + docker compose up -d + +docker-compose-down: + docker compose down docker-build: docker build -t $(imageName) . docker-run: docker run -dp 127.0.0.1:3000:3000 $(imageName) - + +## docker-sources: https://docs.docker.com/compose/gettingstarted/