From 50fd574a8eb7f471b4fbe3b6ab84ad21ae66017f Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:40:17 +0200 Subject: [PATCH 01/10] From infra iac --- docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..43c64a4 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3' + +services: + web-app: + image: git.webdeploy.it/pianello/pianello-web-app:latest + restart: always + container_name: pianello-web-app + ports: + - 127.0.0.1:8080:80' From b4b1ebd36ba062e566ccea2f3108356051e3ef7c Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:43:04 +0200 Subject: [PATCH 02/10] Let the dockerfile do the build --- Dockerfile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 055c85c..5d76c6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,16 @@ -FROM nginx +FROM node:18 AS build + +WORKDIR /usr +COPY package.json ./ +COPY yarn.lock ./ +RUN yarn install --frozen-lockfile +COPY . ./ +RUN yarn build + +FROM nginx:alpine + +COPY --from=build /usr/dist /usr/share/nginx/html +#COPY nginx.conf /etc/nginx/nginx.conf EXPOSE 80 - -RUN rm -rf /usr/share/nginx/html/* - -COPY ./dist/ /usr/share/nginx/html/ +CMD ["nginx","-g","daemon off;"] From 7c25b57d98ddab66e5b16cbed64f4ad1f0f4acb8 Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:43:23 +0200 Subject: [PATCH 03/10] Add .env.example --- .env.example | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..e69de29 From 0240a9759c591385d13851e5b82d9f4141c0b1f9 Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:43:32 +0200 Subject: [PATCH 04/10] Add example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index e69de29..9e8320d 100644 --- a/.env.example +++ b/.env.example @@ -0,0 +1 @@ +TAG=0.0.1 \ No newline at end of file From f5ee1f9a017c1e955ee83a09df968d4924892d5f Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:44:50 +0200 Subject: [PATCH 05/10] Use smaller container for build --- .woodpecker/.build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 4b32d5f..0d70e7b 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -1,13 +1,10 @@ pipeline: build: - image: node:20.2.0-alpine3.16 + image: alpine:3.14 secrets: [docker_password, docker_username] commands: # Install deps - apk add docker docker-compose jq - # Build app - - yarn install --frozen-lockfile - - yarn build # Log into docker registry - echo "$${DOCKER_PASSWORD}" | docker login --password-stdin --username "$${DOCKER_USERNAME}" git.webdeploy.it - echo "TAG=$(jq -r .version ./package.json)" >> .env From 9ef2000326fec92fd33e1d10b3c432853f593cac Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:46:06 +0200 Subject: [PATCH 06/10] Add .env to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1a269c4..5593629 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules/ dist/ -service-worker.build.js \ No newline at end of file +service-worker.build.js +.env \ No newline at end of file From a4c19fc38187d0da7d28d77e30b7b80889c4e638 Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:47:19 +0200 Subject: [PATCH 07/10] Add node_modules to dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 4d8ad97..fb6b202 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ .gitignore .git docker-compose.build.yml +node_modules/ \ No newline at end of file From 5f7d957db3c20ab369abdbb06912ced654fdff9c Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:48:25 +0200 Subject: [PATCH 08/10] Add more things to .dockerignore I think this is way we should building the project inside a subfolder --- .dockerignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index fb6b202..e991578 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,4 +3,8 @@ .gitignore .git docker-compose.build.yml -node_modules/ \ No newline at end of file +node_modules/ +.env.example +LICENSE.md +docker-compose.yml +README.md \ No newline at end of file From 68879a8faf4d0675f00c6cd1ebcec921870cf6b3 Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 20:49:35 +0200 Subject: [PATCH 09/10] Rename prod compose --- docker-compose.yml => docker-compose.prod.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yml => docker-compose.prod.yml (100%) diff --git a/docker-compose.yml b/docker-compose.prod.yml similarity index 100% rename from docker-compose.yml rename to docker-compose.prod.yml From 228b0fa6babb9542492206e75574cfaa7d90da16 Mon Sep 17 00:00:00 2001 From: Alessio Davoli Date: Wed, 31 May 2023 21:00:05 +0200 Subject: [PATCH 10/10] fix compose --- docker-compose.prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 43c64a4..ece1b21 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -6,4 +6,4 @@ services: restart: always container_name: pianello-web-app ports: - - 127.0.0.1:8080:80' + - 127.0.0.1:8080:80