From d97e329f4c7c5a5657bdcb634c5131f234765b66 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 21:53:35 +0100 Subject: [PATCH 01/48] test docker-compose --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 818b559..ee1d737 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "dev": "next dev", "build": "next build", "start": "next start", - "lint": "next lint" + "lint": "next lint", + "start:up": "docker-compose -f docker-compose.yml" }, "dependencies": { "@tailwindcss/typography": "^0.5.8", From 0e18750370de20a1344f396983c659abbcd4d44d Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 21:54:20 +0100 Subject: [PATCH 02/48] test docker-compose --- Dockerfile | 31 +++++++++++++++++++++++++++++++ docker-compose.yml | 22 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5b9e0b0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,31 @@ +#Creates a layer from node:alpine image. +FROM node:alpine + +#Creates directories +RUN mkdir -p /usr/src/app + +#Sets an environment variable +ENV PORT 3000 + +#Sets the working directory for any RUN, CMD, ENTRYPOINT, COPY, and ADD commands +WORKDIR /usr/src/app + +#Copy new files or directories into the filesystem of the container +COPY package.json /usr/src/app +COPY package-lock.json /usr/src/app + +#Execute commands in a new layer on top of the current image and commit the results +RUN npm install + +##Copy new files or directories into the filesystem of the container +COPY . /usr/src/app + +#Execute commands in a new layer on top of the current image and commit the results +RUN npm run build + +#Informs container runtime that the container listens on the specified network ports at runtime +EXPOSE 3000 + +#Allows you to configure a container that will run as an executable +ENTRYPOINT ["npm", "run"] + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5181fc3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +version: '3' + +services: + peroxy-site: + build: + context: . + dommand: start + labels: + - "traefik.enable=true" + - "traefik.http.routers.peroxy-site.entrypoints=https" + - "traefik.http.routers.peroxy-site.rule=Host(`peroxy.dev`)" + - "traefik.http.routers.peroxy-site.tls=true" + - "traefik.http.routers.peroxy-site.tls.certresolver=http" + - "traefik.http.routers.peroxy-site.service=peroxy-site" + - "traefik.http.routers.peroxy-site.loadbalancer.server.port=3000" + - "traefik.docker.network=proxy" + networks: + - proxy + +networks: + proxy: + external: true From a833d2666acc9b3f725a4e7050b314cc20d3e1ca Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 21:59:09 +0100 Subject: [PATCH 03/48] Update '.drone.yml' --- .drone.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index e1346d1..4180347 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,15 +1,8 @@ ---- kind: pipeline -name: default +name: cicd steps: - - name: now - image: one000mph/drone-now # Use one000mph's version as lucaperret's is outdated - environment: - NOW_TOKEN: - from_secret: now_token # Refers to a secret in your drone repo titled "NOW_TOKEN" - settings: - secret: [now_token] # Refers to the above environment variable - deploy_name: peroxy-dev # The name of your vercel project - prod: true # Leave this if you want to deploy to production, remove to disable production -# directory: public # Only if you've pre-rendered the page. Normally you let vercel handle this \ No newline at end of file + - name: test + image: docker/compose + commands: + - docker-compose -f docker-compose-test.yml up From 8f6b36eca1a76648a43b32f2fbb116d6fdeeb00a Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 21:59:56 +0100 Subject: [PATCH 04/48] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4180347..c531a84 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,4 +5,4 @@ steps: - name: test image: docker/compose commands: - - docker-compose -f docker-compose-test.yml up + - docker-compose -f docker-compose.yml up From 611fe5f12b699c5182d36e45fad2bc22e009bf3e Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:00:54 +0100 Subject: [PATCH 05/48] Update 'docker-compose.yml' --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5181fc3..9a63329 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: peroxy-site: build: context: . - dommand: start + command: start labels: - "traefik.enable=true" - "traefik.http.routers.peroxy-site.entrypoints=https" From 2cfcc3c892729a45dfda7227a35138b8f2fc6b98 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:02:34 +0100 Subject: [PATCH 06/48] Update 'docker-compose.yml' --- docker-compose.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9a63329..26d39c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,18 @@ version: '3' services: - peroxy-site: + peroxy_site: build: context: . command: start labels: - "traefik.enable=true" - - "traefik.http.routers.peroxy-site.entrypoints=https" - - "traefik.http.routers.peroxy-site.rule=Host(`peroxy.dev`)" - - "traefik.http.routers.peroxy-site.tls=true" - - "traefik.http.routers.peroxy-site.tls.certresolver=http" - - "traefik.http.routers.peroxy-site.service=peroxy-site" - - "traefik.http.routers.peroxy-site.loadbalancer.server.port=3000" + - "traefik.http.routers.peroxy_site.entrypoints=https" + - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" + - "traefik.http.routers.peroxy_site.tls=true" + - "traefik.http.routers.peroxy_site.tls.certresolver=http" + - "traefik.http.routers.peroxy_site.service=peroxy_site" + - "traefik.http.routers.peroxy_site.loadbalancer.server.port=3000" - "traefik.docker.network=proxy" networks: - proxy From 5f2853083f470eb68710129e7da0158c9f7c21cd Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:04:21 +0100 Subject: [PATCH 07/48] Add 'docker-compose.start.yml' --- docker-compose.start.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 docker-compose.start.yml diff --git a/docker-compose.start.yml b/docker-compose.start.yml new file mode 100644 index 0000000..bd18fac --- /dev/null +++ b/docker-compose.start.yml @@ -0,0 +1,4 @@ +version: "3" +services: + peroxy_site: + command: start From c77371b0a49ef65e215da65a9e1ace9c0bca8383 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:04:41 +0100 Subject: [PATCH 08/48] Update 'docker-compose.yml' --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 26d39c9..ed93795 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: peroxy_site: build: context: . - command: start + #command: start labels: - "traefik.enable=true" - "traefik.http.routers.peroxy_site.entrypoints=https" From a609afcefcc8e876f70c2b64224aa3d033575c44 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:05:05 +0100 Subject: [PATCH 09/48] Update 'package.json' --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee1d737..2760b05 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "next build", "start": "next start", "lint": "next lint", - "start:up": "docker-compose -f docker-compose.yml" + "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml" }, "dependencies": { "@tailwindcss/typography": "^0.5.8", From f1f84aec3d006f0fc57e041a9b4b81ba9cadbc87 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:05:59 +0100 Subject: [PATCH 10/48] Update '.drone.yml' --- .drone.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.drone.yml b/.drone.yml index c531a84..dbd5d0b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,3 +6,8 @@ steps: image: docker/compose commands: - docker-compose -f docker-compose.yml up + +volumes: + - name: docker_socket + host: + path: /var/run/docker.sock From 2ff40d856a396ba0d09040a29ceb547ae2b5e8fe Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:09:24 +0100 Subject: [PATCH 11/48] Update '.drone.yml' --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index dbd5d0b..633e513 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,6 +4,9 @@ name: cicd steps: - name: test image: docker/compose + volumes: + - name: docker_socket + path: /var/run/docker.sock commands: - docker-compose -f docker-compose.yml up From 9ee61716d46fffeab3f522f51f133844c9013807 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:10:55 +0100 Subject: [PATCH 12/48] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5b9e0b0..a2c7b91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /usr/src/app #Copy new files or directories into the filesystem of the container COPY package.json /usr/src/app -COPY package-lock.json /usr/src/app +#COPY package-lock.json /usr/src/app #Execute commands in a new layer on top of the current image and commit the results RUN npm install From 77ae0a746b0a712abe83d5a848871aee9dd7dacb Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:13:50 +0100 Subject: [PATCH 13/48] Update 'package.json' --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2760b05..ec5eacf 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "next build", "start": "next start", "lint": "next lint", - "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml" + "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml -d" }, "dependencies": { "@tailwindcss/typography": "^0.5.8", From 2913688e6328d0d58d938fed4e1e8b257ef867a6 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:15:21 +0100 Subject: [PATCH 14/48] Update 'package.json' --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec5eacf..946355f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "next build", "start": "next start", "lint": "next lint", - "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml -d" + "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml -d --force-recreate" }, "dependencies": { "@tailwindcss/typography": "^0.5.8", From 25cd9c75ab7f8c78ae1cfde7ab4192d3d735b37c Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:20:34 +0100 Subject: [PATCH 15/48] Update 'package.json' --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 946355f..a38f060 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "next build", "start": "next start", "lint": "next lint", - "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml -d --force-recreate" + "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml up -d --force-recreate" }, "dependencies": { "@tailwindcss/typography": "^0.5.8", From 31c7e8ea27cb997dac035cf15cfaed2abed0431b Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:22:39 +0100 Subject: [PATCH 16/48] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 633e513..22ceff4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose -f docker-compose.yml up + - docker-compose -f docker-compose.yml -f docker-compose.start.yml up volumes: - name: docker_socket From da4c565cb30443112f290e64ce21c75fa7a06fe8 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:25:01 +0100 Subject: [PATCH 17/48] Update 'docker-compose.yml' --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index ed93795..d23ce48 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,7 @@ version: '3' services: peroxy_site: + container_name: peroxy_site build: context: . #command: start From 2abb8a1bfccc73ae1d3ae6db659d86c885b61128 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:26:34 +0100 Subject: [PATCH 18/48] Update 'docker-compose.start.yml' --- docker-compose.start.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker-compose.start.yml b/docker-compose.start.yml index bd18fac..d8a6704 100644 --- a/docker-compose.start.yml +++ b/docker-compose.start.yml @@ -2,3 +2,19 @@ version: "3" services: peroxy_site: command: start + + labels: + - "traefik.enable=true" + - "traefik.http.routers.peroxy_site.entrypoints=https" + - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" + - "traefik.http.routers.peroxy_site.tls=true" + - "traefik.http.routers.peroxy_site.tls.certresolver=http" + - "traefik.http.routers.peroxy_site.service=peroxy_site" + - "traefik.http.routers.peroxy_site.loadbalancer.server.port=3000" + - "traefik.docker.network=proxy" + networks: + - proxy + +networks: + proxy: + external: true From e1e9a41d598a5799ae57075835b0ec63648a92aa Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:27:26 +0100 Subject: [PATCH 19/48] Update 'docker-compose.start.yml' --- docker-compose.start.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.start.yml b/docker-compose.start.yml index d8a6704..47e784d 100644 --- a/docker-compose.start.yml +++ b/docker-compose.start.yml @@ -3,17 +3,17 @@ services: peroxy_site: command: start - labels: - - "traefik.enable=true" - - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" - - "traefik.http.routers.peroxy_site.tls=true" - - "traefik.http.routers.peroxy_site.tls.certresolver=http" - - "traefik.http.routers.peroxy_site.service=peroxy_site" - - "traefik.http.routers.peroxy_site.loadbalancer.server.port=3000" - - "traefik.docker.network=proxy" - networks: - - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.peroxy_site.entrypoints=https" + - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" + - "traefik.http.routers.peroxy_site.tls=true" + - "traefik.http.routers.peroxy_site.tls.certresolver=http" + - "traefik.http.routers.peroxy_site.service=peroxy_site" + - "traefik.http.routers.peroxy_site.loadbalancer.server.port=3000" + - "traefik.docker.network=proxy" + networks: + - proxy networks: proxy: From 2a6198aa1facb010eb5fc0bbe2aaa78aa245626e Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:31:20 +0100 Subject: [PATCH 20/48] Update 'docker-compose.start.yml' --- docker-compose.start.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.start.yml b/docker-compose.start.yml index 47e784d..3591c8f 100644 --- a/docker-compose.start.yml +++ b/docker-compose.start.yml @@ -6,7 +6,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" + - "traefik.http.routers.peroxy_site.rule=Host(`www.peroxy.dev`)" - "traefik.http.routers.peroxy_site.tls=true" - "traefik.http.routers.peroxy_site.tls.certresolver=http" - "traefik.http.routers.peroxy_site.service=peroxy_site" From 49fc655de992cc06c88ec181278e3f2abb5cd97d Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:37:43 +0100 Subject: [PATCH 21/48] Update 'docker-compose.start.yml' --- docker-compose.start.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.start.yml b/docker-compose.start.yml index 3591c8f..a5efbe2 100644 --- a/docker-compose.start.yml +++ b/docker-compose.start.yml @@ -9,8 +9,8 @@ services: - "traefik.http.routers.peroxy_site.rule=Host(`www.peroxy.dev`)" - "traefik.http.routers.peroxy_site.tls=true" - "traefik.http.routers.peroxy_site.tls.certresolver=http" - - "traefik.http.routers.peroxy_site.service=peroxy_site" - - "traefik.http.routers.peroxy_site.loadbalancer.server.port=3000" + - "traefik.http.routers.peroxy_site.service=peroxy_site-service" + - "traefik.http.services.peroxy_site-service.loadbalancer.server.port=3000" - "traefik.docker.network=proxy" networks: - proxy From a83e68ea737bb005dda931a3df171dbe7b3311d1 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:40:08 +0100 Subject: [PATCH 22/48] Update 'docker-compose.start.yml' --- docker-compose.start.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.start.yml b/docker-compose.start.yml index a5efbe2..578b820 100644 --- a/docker-compose.start.yml +++ b/docker-compose.start.yml @@ -6,7 +6,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`www.peroxy.dev`)" + - "traefik.http.routers.peroxy_site.rule=Host(`site.peroxy.dev`)" - "traefik.http.routers.peroxy_site.tls=true" - "traefik.http.routers.peroxy_site.tls.certresolver=http" - "traefik.http.routers.peroxy_site.service=peroxy_site-service" From bf0e8e2c02e24c311c149d68cd97c57eb03ea4f6 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:41:43 +0100 Subject: [PATCH 23/48] Update 'docker-compose.start.yml' --- docker-compose.start.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.start.yml b/docker-compose.start.yml index 578b820..58ddce1 100644 --- a/docker-compose.start.yml +++ b/docker-compose.start.yml @@ -11,7 +11,6 @@ services: - "traefik.http.routers.peroxy_site.tls.certresolver=http" - "traefik.http.routers.peroxy_site.service=peroxy_site-service" - "traefik.http.services.peroxy_site-service.loadbalancer.server.port=3000" - - "traefik.docker.network=proxy" networks: - proxy From c7142813308411d8289ebf3895a5852f791dd0e3 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:43:25 +0100 Subject: [PATCH 24/48] Update 'docker-compose.start.yml' --- docker-compose.start.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/docker-compose.start.yml b/docker-compose.start.yml index 58ddce1..bd18fac 100644 --- a/docker-compose.start.yml +++ b/docker-compose.start.yml @@ -2,18 +2,3 @@ version: "3" services: peroxy_site: command: start - - labels: - - "traefik.enable=true" - - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`site.peroxy.dev`)" - - "traefik.http.routers.peroxy_site.tls=true" - - "traefik.http.routers.peroxy_site.tls.certresolver=http" - - "traefik.http.routers.peroxy_site.service=peroxy_site-service" - - "traefik.http.services.peroxy_site-service.loadbalancer.server.port=3000" - networks: - - proxy - -networks: - proxy: - external: true From c3f3a4914a6454de2e69704b7ba84a5d3a7f0753 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:45:36 +0100 Subject: [PATCH 25/48] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 22ceff4..c476eaa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose -f docker-compose.yml -f docker-compose.start.yml up + - docker-compose -f docker-compose.yml -f docker-compose.start.yml up -d --force-recreate volumes: - name: docker_socket From d19966babac2722ae65cb25ed7203104d798f34c Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:47:04 +0100 Subject: [PATCH 26/48] Update 'docker-compose.yml' --- docker-compose.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d23ce48..5b5527e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,18 +5,16 @@ services: container_name: peroxy_site build: context: . - #command: start - labels: - - "traefik.enable=true" - - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" - - "traefik.http.routers.peroxy_site.tls=true" - - "traefik.http.routers.peroxy_site.tls.certresolver=http" - - "traefik.http.routers.peroxy_site.service=peroxy_site" - - "traefik.http.routers.peroxy_site.loadbalancer.server.port=3000" - - "traefik.docker.network=proxy" + labels: + - "traefik.enable=true" + - "traefik.http.routers.peroxy_site.entrypoints=https" + - "traefik.http.routers.peroxy_site.rule=Host(`site.peroxy.dev`)" + - "traefik.http.routers.peroxy_site.tls=true" + - "traefik.http.routers.peroxy_site.tls.certresolver=http" + - "traefik.http.routers.peroxy_site.service=peroxy_site-service" + - "traefik.http.services.peroxy_site-service.loadbalancer.server.port=3000" networks: - - proxy + - proxy networks: proxy: From 4c4e762a4aafb3a42e1e53bc125e867147c33825 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:48:40 +0100 Subject: [PATCH 27/48] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c476eaa..c7f6ccb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose -f docker-compose.yml -f docker-compose.start.yml up -d --force-recreate + - docker-compose -f docker-compose.yml up -d --force-recreate volumes: - name: docker_socket From bbe50c479074ed8ab722fe685e2aaf3e480fdd69 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:49:43 +0100 Subject: [PATCH 28/48] Update 'docker-compose.yml' --- docker-compose.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b5527e..bdfc486 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,19 +3,20 @@ version: '3' services: peroxy_site: container_name: peroxy_site + command: start build: context: . labels: - - "traefik.enable=true" - - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`site.peroxy.dev`)" - - "traefik.http.routers.peroxy_site.tls=true" - - "traefik.http.routers.peroxy_site.tls.certresolver=http" - - "traefik.http.routers.peroxy_site.service=peroxy_site-service" - - "traefik.http.services.peroxy_site-service.loadbalancer.server.port=3000" + - "traefik.enable=true" + - "traefik.http.routers.peroxy_site.entrypoints=https" + - "traefik.http.routers.peroxy_site.rule=Host(`site.peroxy.dev`)" + - "traefik.http.routers.peroxy_site.tls=true" + - "traefik.http.routers.peroxy_site.tls.certresolver=http" + - "traefik.http.routers.peroxy_site.service=peroxy_site-service" + - "traefik.http.services.peroxy_site-service.loadbalancer.server.port=3000" networks: - - proxy + - proxy networks: proxy: - external: true + external: true \ No newline at end of file From 1c165a68cb4fb7bc26fa442540042cc7fa7b0143 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:50:45 +0100 Subject: [PATCH 29/48] Update 'docker-compose.yml' --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bdfc486..bf86a4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: command: start build: context: . - labels: + labels: - "traefik.enable=true" - "traefik.http.routers.peroxy_site.entrypoints=https" - "traefik.http.routers.peroxy_site.rule=Host(`site.peroxy.dev`)" From 144020b6d10a73a55fc150f1d57a5cfbadd102eb Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:51:43 +0100 Subject: [PATCH 30/48] Update 'docker-compose.yml' --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bf86a4a..7ad774a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`site.peroxy.dev`)" + - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" - "traefik.http.routers.peroxy_site.tls=true" - "traefik.http.routers.peroxy_site.tls.certresolver=http" - "traefik.http.routers.peroxy_site.service=peroxy_site-service" From e37f2f02129f30f71dfbce6c2a6a929b3f67d7fb Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:55:02 +0100 Subject: [PATCH 31/48] Update 'docker-compose.yml' --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7ad774a..7034c64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.peroxy_site.entrypoints=https" - - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`)" + - "traefik.http.routers.peroxy_site.rule=Host(`peroxy.dev`, `www.peroxy.dev`)" - "traefik.http.routers.peroxy_site.tls=true" - "traefik.http.routers.peroxy_site.tls.certresolver=http" - "traefik.http.routers.peroxy_site.service=peroxy_site-service" From 281e0f41700fe09ac19d6987dee4e9655e5987ff Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:56:21 +0100 Subject: [PATCH 32/48] Delete 'docker-compose.start.yml' --- docker-compose.start.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 docker-compose.start.yml diff --git a/docker-compose.start.yml b/docker-compose.start.yml deleted file mode 100644 index bd18fac..0000000 --- a/docker-compose.start.yml +++ /dev/null @@ -1,4 +0,0 @@ -version: "3" -services: - peroxy_site: - command: start From 74aa0ab9256d37dadf0abbdef8419ceffd8abb6b Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 22:56:36 +0100 Subject: [PATCH 33/48] Update 'package.json' --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index a38f060..93157ec 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "build": "next build", "start": "next start", "lint": "next lint", - "start:up": "docker-compose -f docker-compose.yml -f docker-compose.start.yml up -d --force-recreate" }, "dependencies": { "@tailwindcss/typography": "^0.5.8", From d229d639fd826940e2e2a2528dde0ec4e2be20cf Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:29:50 +0100 Subject: [PATCH 34/48] add dev support --- .drone.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c7f6ccb..fb7d064 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,16 +1,36 @@ +--- kind: pipeline name: cicd steps: - - name: test + - name: prod image: docker/compose volumes: - name: docker_socket path: /var/run/docker.sock commands: - docker-compose -f docker-compose.yml up -d --force-recreate - + trigger: + branch: + - main +--- +kind: pipeline +name: cicd + +steps: + - name: dev + image: docker/compose + volumes: + - name: docker_socket + path: /var/run/docker.sock + commands: + - docker-compose -f docker-compose.dev.yml up -d --force-recreate + trigger: + branch: + - dev + volumes: - name: docker_socket host: path: /var/run/docker.sock + From be1b6268e743b45cfc7ff3a2dd6c87836690bd17 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:30:20 +0100 Subject: [PATCH 35/48] add dev support --- docker-compose.dev.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 docker-compose.dev.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..ad76184 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,22 @@ +version: '3' + +services: + peroxy_site_dev: + container_name: peroxy_site_dev + command: start + build: + context: . + labels: + - "traefik.enable=true" + - "traefik.http.routers.peroxy_site_dev.entrypoints=https" + - "traefik.http.routers.peroxy_site_dev.rule=Host(`test.peroxy.dev`)" + - "traefik.http.routers.peroxy_site_dev.tls=true" + - "traefik.http.routers.peroxy_site_dev.tls.certresolver=http" + - "traefik.http.routers.peroxy_site_dev.service=peroxy_site_dev-service" + - "traefik.http.services.peroxy_site_dev-service.loadbalancer.server.port=3000" + networks: + - proxy + +networks: + proxy: + external: true From d71f599f0d8b7e4e20b2f5ebeb329edeaaefadd8 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:31:19 +0100 Subject: [PATCH 36/48] fix pipeline name --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index fb7d064..94d9dbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: cicd +name: prod-pipe steps: - name: prod @@ -15,7 +15,7 @@ steps: - main --- kind: pipeline -name: cicd +name: dev-pipe steps: - name: dev From 4be09b810092d8fbdeb029778c4a725f30edf8c8 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:33:38 +0100 Subject: [PATCH 37/48] fix pipeline --- .drone.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.drone.yml b/.drone.yml index 94d9dbc..f634bf4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,6 +13,11 @@ steps: trigger: branch: - main + +volumes: + - name: docker_socket + host: + path: /var/run/docker.sock --- kind: pipeline name: dev-pipe From 406183536e20fc3720efbb918250e83eeecce1a2 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:35:26 +0100 Subject: [PATCH 38/48] fix pipeline --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index f634bf4..fcaea4f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,9 +10,9 @@ steps: path: /var/run/docker.sock commands: - docker-compose -f docker-compose.yml up -d --force-recreate - trigger: - branch: - - main + trigger: + branch: + - main volumes: - name: docker_socket @@ -30,9 +30,9 @@ steps: path: /var/run/docker.sock commands: - docker-compose -f docker-compose.dev.yml up -d --force-recreate - trigger: - branch: - - dev + trigger: + branch: + - dev volumes: - name: docker_socket From 5a9e65396c98f16cc9b0ea77ea5b1869842abf61 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:36:35 +0100 Subject: [PATCH 39/48] fix trigger --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index fcaea4f..a4d4238 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,9 +10,9 @@ steps: path: /var/run/docker.sock commands: - docker-compose -f docker-compose.yml up -d --force-recreate - trigger: - branch: - - main +trigger: + branch: + - main volumes: - name: docker_socket @@ -30,9 +30,9 @@ steps: path: /var/run/docker.sock commands: - docker-compose -f docker-compose.dev.yml up -d --force-recreate - trigger: - branch: - - dev +trigger: + branch: + - dev volumes: - name: docker_socket From 75e24a6a080aa8d8bd7e154811edc1f0038b729c Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:38:09 +0100 Subject: [PATCH 40/48] package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93157ec..818b559 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dev": "next dev", "build": "next build", "start": "next start", - "lint": "next lint", + "lint": "next lint" }, "dependencies": { "@tailwindcss/typography": "^0.5.8", From 083fb3fd483b35f2a0bf1c4cfebc63fff61c82f2 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:42:56 +0100 Subject: [PATCH 41/48] test changes --- content/blogs/first-blog.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/blogs/first-blog.md b/content/blogs/first-blog.md index 8eee6bd..dac92c1 100644 --- a/content/blogs/first-blog.md +++ b/content/blogs/first-blog.md @@ -8,4 +8,6 @@ description: Short description # First blog -Insane \ No newline at end of file +Insane + +test change From b20052800711661dd02b37f46155ce19b39258d7 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:44:42 +0100 Subject: [PATCH 42/48] test changes --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index a4d4238..d3cc14e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,6 +9,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: + - docker-compose -f docker-compose.yml down -v - docker-compose -f docker-compose.yml up -d --force-recreate trigger: branch: @@ -29,6 +30,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: + - docker-compose -f docker-compose.dev.yml down -v - docker-compose -f docker-compose.dev.yml up -d --force-recreate trigger: branch: From a1a0e15f6db61174b22e237d6bc54618805dc8d4 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:51:06 +0100 Subject: [PATCH 43/48] test changes --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d3cc14e..e16e11e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose -f docker-compose.dev.yml down -v + - docker-compose rm -f docker-compose.dev.yml - docker-compose -f docker-compose.dev.yml up -d --force-recreate trigger: branch: From de224373edf5292162aca7ee408b8edc11b8b478 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:51:51 +0100 Subject: [PATCH 44/48] test changes --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e16e11e..d31e974 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose rm -f docker-compose.dev.yml + - docker-compose rm -f peroxy_site_dev - docker-compose -f docker-compose.dev.yml up -d --force-recreate trigger: branch: From 9a7e9048f2cf2216fd7b6bf2ef88b85f68fa74c8 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:54:38 +0100 Subject: [PATCH 45/48] test changes --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index d31e974..55ac5c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,8 +30,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose rm -f peroxy_site_dev - - docker-compose -f docker-compose.dev.yml up -d --force-recreate + - docker-compose -f docker-compose.dev.yml up --build --no-cache --force-recreate -d trigger: branch: - dev From 7eed2ee59aabf136bcae0c9417fcc54b131ea3ed Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:56:47 +0100 Subject: [PATCH 46/48] test changes --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 55ac5c3..1d8d2b9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose -f docker-compose.dev.yml up --build --no-cache --force-recreate -d + - docker-compose -f docker-compose.dev.yml up --build --force-recreate -d trigger: branch: - dev From ceee45409db8fb8e2853a59998aaedbf8124b384 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Wed, 28 Dec 2022 23:58:45 +0100 Subject: [PATCH 47/48] test changes --- components/Navbar.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 5f47e2d..7915ae6 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -5,9 +5,9 @@ import { motion, AnimatePresence } from "framer-motion"; import { Logo } from "./Logo"; const links = [ - { name: "blog", href: "/blog" }, - { name: "projects", href: "/projects" }, - { name: "github", href: "https://git.peroxy.dev/kookroach" }, + { name: "Blog", href: "/blog" }, + { name: "Projects", href: "/projects" }, + { name: "Gitea", href: "https://git.peroxy.dev/kookroach" }, ]; export const Navbar = () => { const [showMenu, setShowMenu] = useState(false); From 94ca95821dd44d50b9d98045df1ed83b062da10b Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Thu, 29 Dec 2022 00:00:17 +0100 Subject: [PATCH 48/48] all done --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1d8d2b9..24581e1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,8 +9,7 @@ steps: - name: docker_socket path: /var/run/docker.sock commands: - - docker-compose -f docker-compose.yml down -v - - docker-compose -f docker-compose.yml up -d --force-recreate + - docker-compose -f docker-compose.yml up --build --force-recreate -d trigger: branch: - main