From d5c7674bd6142e4a30027813a636072ceef3a91d Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:05:35 +0100 Subject: [PATCH 01/21] Importing Docker Compose --- docker-compose.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..590af5b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,41 @@ +version: "3" + +networks: + artnetwork: + external: true + internal: + external: false + +services: + artsite: + image: artsite:latest + labels: + - traefik.backend=artsite + - traefik.frontend.rule=Host:dev.arthurdanjou.fr + - traefik.docker.network=artnetwork + - traefik.port=443 + networks: + - internal + - artnetwork + depends_on: + - artapi + artapi: + image: artapi:latest + labels: + - traefik.backend=api + - traefik.frontend.rule=Host:devapi.arthurdanjou.fr + - traefik.docker.network=artnetwork + - traefik.port=443 + networks: + - internal + - artnetwork + depends_on: + - mysql + mariadb: + image: mariadb:10.5.8-focal + environment: + MYSQL_ROOT_PASSWORD: + networks: + - internal + labels: + - traefik.enable=false From 78b9d9b89a35a017d3ae026505922fd455502607 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:08:39 +0100 Subject: [PATCH 02/21] Importing Docker Compose --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 590af5b..f56b4c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" networks: - artnetwork: + proxy: external: true internal: external: false @@ -12,11 +12,11 @@ services: labels: - traefik.backend=artsite - traefik.frontend.rule=Host:dev.arthurdanjou.fr - - traefik.docker.network=artnetwork + - traefik.docker.network=proxy - traefik.port=443 networks: - internal - - artnetwork + - proxy depends_on: - artapi artapi: @@ -24,11 +24,11 @@ services: labels: - traefik.backend=api - traefik.frontend.rule=Host:devapi.arthurdanjou.fr - - traefik.docker.network=artnetwork + - traefik.docker.network=proxy - traefik.port=443 networks: - internal - - artnetwork + - proxy depends_on: - mysql mariadb: From fc113408e4cee2ba664cfcd2f4ce4bc5615960c2 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:10:45 +0100 Subject: [PATCH 03/21] Working on Docker Compose --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f56b4c2..a7e0e7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,8 +17,8 @@ services: networks: - internal - proxy - depends_on: - - artapi + depends_on: + - artapi artapi: image: artapi:latest labels: @@ -29,8 +29,8 @@ services: networks: - internal - proxy - depends_on: - - mysql + depends_on: + - mysql mariadb: image: mariadb:10.5.8-focal environment: From b55019ed7adf626506f07fd61d53845da82ad77d Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:24:42 +0100 Subject: [PATCH 04/21] Working on Docker Compose --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a7e0e7c..bbec245 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: - internal - proxy depends_on: - - mysql + - mariadb mariadb: image: mariadb:10.5.8-focal environment: From ec401f6d1efc4ee083471a51f0bd079e933448bb Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:44:01 +0100 Subject: [PATCH 05/21] Working on Docker Compose | Using volumes --- docker-compose.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index bbec245..dcb5940 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,7 @@ services: - proxy depends_on: - mariadb + - redis mariadb: image: mariadb:10.5.8-focal environment: @@ -39,3 +40,15 @@ services: - internal labels: - traefik.enable=false + volumes: + - "/root/mariadb/data:/var/lib/mysql" + redis: + image: redis:6.0.10 + environment: + MYSQL_ROOT_PASSWORD: + networks: + - internal + labels: + - traefik.enable=false + volumes: + - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf" From f328a75b5c925c4f27814f7a19f7c092305f518c Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:46:12 +0100 Subject: [PATCH 06/21] Working on Docker Compose | Set names --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dcb5940..2825ad3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ networks: services: artsite: image: artsite:latest + container_name: artsite labels: - traefik.backend=artsite - traefik.frontend.rule=Host:dev.arthurdanjou.fr @@ -21,6 +22,7 @@ services: - artapi artapi: image: artapi:latest + container_name: artapi labels: - traefik.backend=api - traefik.frontend.rule=Host:devapi.arthurdanjou.fr @@ -34,6 +36,7 @@ services: - redis mariadb: image: mariadb:10.5.8-focal + container_name: mariadb environment: MYSQL_ROOT_PASSWORD: networks: @@ -44,6 +47,7 @@ services: - "/root/mariadb/data:/var/lib/mysql" redis: image: redis:6.0.10 + container_name: redis environment: MYSQL_ROOT_PASSWORD: networks: From acaa9672b9ec8f86cf24eeecc86aa974a58f0f63 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:49:42 +0100 Subject: [PATCH 07/21] Working on Docker Compose | Register into Traefik --- docker-compose.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2825ad3..cc9b8c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,9 +11,8 @@ services: image: artsite:latest container_name: artsite labels: - - traefik.backend=artsite - - traefik.frontend.rule=Host:dev.arthurdanjou.fr - - traefik.docker.network=proxy + - traefik.http.routers.artsite.rule=Host(`api.arthurdanjou.fr`) + - traefik.http.routers.artsite.tls=true - traefik.port=443 networks: - internal @@ -24,9 +23,8 @@ services: image: artapi:latest container_name: artapi labels: - - traefik.backend=api - - traefik.frontend.rule=Host:devapi.arthurdanjou.fr - - traefik.docker.network=proxy + - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) + - traefik.http.routers.artapi.tls=true - traefik.port=443 networks: - internal From ebb34af3755dfa0b8ae538b5b34d6071047b5726 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:51:05 +0100 Subject: [PATCH 08/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cc9b8c4..2487b56 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,11 +46,9 @@ services: redis: image: redis:6.0.10 container_name: redis - environment: - MYSQL_ROOT_PASSWORD: - networks: - - internal - labels: - - traefik.enable=false + networks: + - internal + labels: + - traefik.enable=false volumes: - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf" From 5e4b72341d43bd85fb8a027b0303f14ea7ac4446 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 17:53:39 +0100 Subject: [PATCH 09/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2487b56..4dfed9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: image: artsite:latest container_name: artsite labels: - - traefik.http.routers.artsite.rule=Host(`api.arthurdanjou.fr`) + - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - traefik.port=443 networks: From 2ef569829eccdbe1b5180057e092d5c8a66d75a8 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 18:15:40 +0100 Subject: [PATCH 10/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4dfed9a..ef46998 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,7 @@ services: labels: - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true + - traefik.http.routers.adminer.tls.certresolver=cloudflare - traefik.port=443 networks: - internal @@ -25,6 +26,7 @@ services: labels: - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true + - traefik.http.routers.adminer.tls.certresolver=cloudflare - traefik.port=443 networks: - internal From 9e0a8cf1fdc63ba8f88cdb3b18d0774e91771500 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 18:17:22 +0100 Subject: [PATCH 11/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ef46998..01241d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: labels: - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - - traefik.http.routers.adminer.tls.certresolver=cloudflare + - traefik.http.routers.artsite.tls.certresolver=cloudflare - traefik.port=443 networks: - internal @@ -26,7 +26,7 @@ services: labels: - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true - - traefik.http.routers.adminer.tls.certresolver=cloudflare + - traefik.http.routers.artapi.tls.certresolver=cloudflare - traefik.port=443 networks: - internal From aaab5f268cb73bd32fd3f8465f9391ecb8af705d Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 18:22:54 +0100 Subject: [PATCH 12/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 01241d4..1a659e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: labels: - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - - traefik.http.routers.artsite.tls.certresolver=cloudflare + - traefik.http.routers.artsite.tls.certresolver=letsencrypt - traefik.port=443 networks: - internal @@ -26,7 +26,7 @@ services: labels: - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true - - traefik.http.routers.artapi.tls.certresolver=cloudflare + - traefik.http.routers.artapi.tls.certresolver=letsencrypt - traefik.port=443 networks: - internal From 8627d90d79456de27b15c2b4d7465662109bd978 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 18:27:20 +0100 Subject: [PATCH 13/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1a659e6..637c4e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: labels: - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - - traefik.http.routers.artsite.tls.certresolver=letsencrypt + - traefik.http.routers.artsite.tls.certresolver=lets-encrypt - traefik.port=443 networks: - internal @@ -26,7 +26,7 @@ services: labels: - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true - - traefik.http.routers.artapi.tls.certresolver=letsencrypt + - traefik.http.routers.artapi.tls.certresolver=lets-encrypt - traefik.port=443 networks: - internal From 97c7f35eea9e96c40d52532327fe0848aab297d3 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 18:31:12 +0100 Subject: [PATCH 14/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 637c4e8..55db217 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: - traefik.http.routers.artsite.tls=true - traefik.http.routers.artsite.tls.certresolver=lets-encrypt - traefik.port=443 + ports: + - 3333:3333 networks: - internal - proxy @@ -28,6 +30,8 @@ services: - traefik.http.routers.artapi.tls=true - traefik.http.routers.artapi.tls.certresolver=lets-encrypt - traefik.port=443 + ports: + - 5555:5555 networks: - internal - proxy From 3d4dda6d49cab0195a60dd3556fd922cd80a325c Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 18:56:10 +0100 Subject: [PATCH 15/21] Working on --- docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 55db217..2a77a38 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,10 @@ version: "3" networks: proxy: + name: proxy external: true internal: + name: internal external: false services: @@ -13,7 +15,7 @@ services: labels: - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - - traefik.http.routers.artsite.tls.certresolver=lets-encrypt + - traefik.http.routers.artsite.tls.certresolver=cloudflare - traefik.port=443 ports: - 3333:3333 @@ -28,7 +30,7 @@ services: labels: - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true - - traefik.http.routers.artapi.tls.certresolver=lets-encrypt + - traefik.http.routers.artapi.tls.certresolver=cloudflare - traefik.port=443 ports: - 5555:5555 From 6c9511f6dae475ddebaaeadfa7be00ba87eb1f2f Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 19:02:50 +0100 Subject: [PATCH 16/21] Working on --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2a77a38..40f78e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: labels: - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - - traefik.http.routers.artsite.tls.certresolver=cloudflare + - traefik.http.routers.artsite.tls.certresolver=lets-encrypt - traefik.port=443 ports: - 3333:3333 @@ -30,7 +30,7 @@ services: labels: - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true - - traefik.http.routers.artapi.tls.certresolver=cloudflare + - traefik.http.routers.artapi.tls.certresolver=lets-encrypt - traefik.port=443 ports: - 5555:5555 From 7d2b6851c184c028601d66fed754877eedea5ba2 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 19:15:04 +0100 Subject: [PATCH 17/21] Working on --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 40f78e2..04df84b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - traefik.http.routers.artsite.tls.certresolver=lets-encrypt + - traefik.docker.network=proxy - traefik.port=443 ports: - 3333:3333 @@ -31,6 +32,7 @@ services: - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true - traefik.http.routers.artapi.tls.certresolver=lets-encrypt + - traefik.docker.network=proxy - traefik.port=443 ports: - 5555:5555 From ee529850c2d1a8b1d9f4d83cdb55737dd05b7fe8 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 19:19:03 +0100 Subject: [PATCH 18/21] Prepare to production --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 04df84b..0519e1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: image: artsite:latest container_name: artsite labels: - - traefik.http.routers.artsite.rule=Host(`dev.arthurdanjou.fr`) + - traefik.http.routers.artsite.rule=Host(`arthurdanjou.fr`) - traefik.http.routers.artsite.tls=true - traefik.http.routers.artsite.tls.certresolver=lets-encrypt - traefik.docker.network=proxy @@ -29,7 +29,7 @@ services: image: artapi:latest container_name: artapi labels: - - traefik.http.routers.artapi.rule=Host(`devapi.arthurdanjou.fr`) + - traefik.http.routers.artapi.rule=Host(`api.arthurdanjou.fr`) - traefik.http.routers.artapi.tls=true - traefik.http.routers.artapi.tls.certresolver=lets-encrypt - traefik.docker.network=proxy From 37612fc988d272e9c2c20fcc0eef2b75fe71dec9 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 19:40:39 +0100 Subject: [PATCH 19/21] Working on Docker Compose | Fix syntax --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0519e1c..91ea95a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,4 +61,4 @@ services: labels: - traefik.enable=false volumes: - - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf" + - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf/redis.conf" From 3353c377e34136eec8428cf097b146542c7a076c Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Thu, 18 Feb 2021 21:21:52 +0100 Subject: [PATCH 20/21] Working on docker compose --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 91ea95a..0519e1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,4 +61,4 @@ services: labels: - traefik.enable=false volumes: - - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf/redis.conf" + - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf" From 6f4f0370664eaaad46c7dd9cd619b994d7dc86db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Feb 2021 00:29:36 +0000 Subject: [PATCH 21/21] fix(deps): bump sass from 1.32.7 to 1.32.8 Bumps [sass](https://github.com/sass/dart-sass) from 1.32.7 to 1.32.8. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.32.7...1.32.8) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bb5a5c5..2219083 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "nuxt": "2.15.0", "nuxt-i18n": "6.20.1", "prism-themes": "1.5.0", - "sass": "1.32.7", + "sass": "1.32.8", "sass-loader": "10.1.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 4840627..3af3f56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8280,10 +8280,10 @@ sass-loader@10.1.1, sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@1.32.7: - version "1.32.7" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.7.tgz#632a9df2b85dc4b346977fcaf2d5e6f2b7039fd8" - integrity sha512-C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A== +sass@1.32.8: + version "1.32.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc" + integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ== dependencies: chokidar ">=2.0.0 <4.0.0"