Merge branch 'master' into dependabot/npm_and_yarn/sass-loader-11.0.1

docker-compose.yml

@@ -0,0 +1,64 @@
+version: "3"
+
+networks:
+  proxy:
+    name: proxy
+    external: true
+  internal:
+    name: internal
+    external: false
+
+services:
+  artsite:
+    image: artsite:latest
+    container_name: artsite
+    labels:
+      - 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
+      - traefik.port=443
+    ports:
+    - 3333:3333
+    networks:
+      - internal
+      - proxy
+    depends_on:
+      - artapi
+  artapi:
+    image: artapi:latest
+    container_name: artapi
+    labels:
+      - 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
+      - traefik.port=443
+    ports:
+      - 5555:5555
+    networks:
+      - internal
+      - proxy
+    depends_on:
+      - mariadb
+      - redis
+  mariadb:
+    image: mariadb:10.5.8-focal
+    container_name: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD:
+    networks:
+      - internal
+    labels:
+      - traefik.enable=false
+    volumes:
+      - "/root/mariadb/data:/var/lib/mysql"
+  redis:
+    image: redis:6.0.10
+    container_name: redis
+    networks:
+      - internal
+    labels:
+      - traefik.enable=false
+    volumes:
+      - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf"

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": "11.0.1"
   },
   "devDependencies": {

yarn.lock

@@ -8288,10 +8288,10 @@ 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"