From 582c0b453ca60e80a6396e9e9a03cb4a0543f7df Mon Sep 17 00:00:00 2001 From: Ratstail91 Date: Fri, 3 May 2024 07:08:09 +1000 Subject: [PATCH] UNTESTED: Updated all dependencies --- configure-script.js | 58 ++++++++++++++++++++++++++------------------- package-lock.json | 18 +++++++------- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/configure-script.js b/configure-script.js index 1009c5e..fee3984 100644 --- a/configure-script.js +++ b/configure-script.js @@ -62,21 +62,19 @@ const question = (prompt, def = null) => { //generate the files const ymlfile = ` -version: '3.8' - services: ${appName}: build: context: . ports: - - "${appPort}" + - ${appPort} labels: - - "traefik.enable=true" - - "traefik.http.routers.${appName}router.rule=Host(\`${appWebAddress}\`)" - - "traefik.http.routers.${appName}router.entrypoints=websecure" - - "traefik.http.routers.${appName}router.tls.certresolver=myresolver" - - "traefik.http.routers.${appName}router.service=${appName}service@docker" - - "traefik.http.services.${appName}service.loadbalancer.server.port=${appPort}" + - traefik.enable=true + - traefik.http.routers.${appName}router.rule=Host(\`${appWebAddress}\`) + - traefik.http.routers.${appName}router.entrypoints=websecure + - traefik.http.routers.${appName}router.tls.certresolver=myresolver + - traefik.http.routers.${appName}router.service=${appName}service@docker + - traefik.http.services.${appName}service.loadbalancer.server.port=${appPort} environment: - WEB_PORT=${appPort} - WEB_ORIGIN=${appWebOrigin} @@ -87,10 +85,14 @@ services: - DB_PASSWORD=${appDBPass} - DB_TIMEZONE=Australia/Sydney - SECRET_ACCESS=${appSecretAccess} + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro networks: - app-network${ appDBHost != 'database' ? '' : ` depends_on: - database + database: image: mariadb:latest environment: @@ -103,35 +105,41 @@ services: - app-network volumes: - ./mysql:/var/lib/mysql - - ./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro`} + - ./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro`} + traefik_${appName}: container_name: ${appName}_traefik - image: "traefik:v2.10" - container_name: "traefik" + image: traefik:v2.10 + container_name: traefik command: - - "--log.level=ERROR" - - "--api.insecure=false" - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entrypoints.websecure.address=:443" - - "--certificatesresolvers.myresolver.acme.tlschallenge=true" - - "--certificatesresolvers.myresolver.acme.email=${supportEmail}" - - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" + - --log.level=ERROR + - --api.insecure=false + - --providers.docker=true + - --providers.docker.exposedbydefault=false + - --entrypoints.websecure.address=:443 + - --certificatesresolvers.myresolver.acme.tlschallenge=true + - --certificatesresolvers.myresolver.acme.email=${supportEmail} + - --certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json ports: - - "80:80" - - "443:443" + - 80:80 + - 443:443 volumes: - - "./letsencrypt:/letsencrypt" - - "/var/run/docker.sock:/var/run/docker.sock:ro" + - ./letsencrypt:/letsencrypt + - /var/run/docker.sock:/var/run/docker.sock:ro + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro networks: - app-network + networks: app-network: driver: bridge `; const dockerfile = ` -FROM node:21-bookworm-slim +FROM node:22-bookworm-slim WORKDIR "/app" COPY package*.json ./ RUN npm install --production diff --git a/package-lock.json b/package-lock.json index 34d0da8..b6a1c8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,9 +22,9 @@ } }, "node_modules/@socket.io/component-emitter": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.1.tgz", - "integrity": "sha512-dzJtaDAAoXx4GCOJpbB2eG/Qj8VDpdwkLsWGzGm+0L7E8/434RyMbAHmk9ubXWVAb9nXmc44jUf8GKqVDiKezg==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", + "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==" }, "node_modules/@types/cookie": { "version": "0.4.1", @@ -58,9 +58,9 @@ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==" }, "node_modules/@types/node": { - "version": "20.12.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", - "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", + "version": "20.12.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz", + "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==", "dependencies": { "undici-types": "~5.26.4" } @@ -840,9 +840,9 @@ "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" }, "node_modules/lru-cache": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", - "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", "engines": { "node": "14 || >=16.14" }