From afa35939fa1bfc6b4c86290c65a147fd17959aae Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 3 Apr 2021 01:05:41 +1100 Subject: [PATCH 01/14] Added docker publishing --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 942f410..b07a29d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,10 @@ "scripts": { "start": "node server/server.js", "dev": "npm run watch:server", - "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'" + "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'", + "docker": "npm run docker:build && npm run docker:push", + "docker:build": "docker build . --platform amd64 --platform arm --tag docker.krgamestudios.com/krgamestudios/01-news:latest", + "docker:push": "docker push docker.krgamestudios.com/krgamestudios/01-news:latest" }, "repository": { "type": "git", From bac87e9c33e64d4f0c5f48e6f49cbb87e210894b Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 3 Apr 2021 01:41:44 +1100 Subject: [PATCH 02/14] Working on multiplatform things --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b07a29d..b81eed2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "dev": "npm run watch:server", "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'", "docker": "npm run docker:build && npm run docker:push", - "docker:build": "docker build . --platform amd64 --platform arm --tag docker.krgamestudios.com/krgamestudios/01-news:latest", + "docker:build": "docker buildx build . --platform amd64 --tag docker.krgamestudios.com/krgamestudios/01-news:latest", "docker:push": "docker push docker.krgamestudios.com/krgamestudios/01-news:latest" }, "repository": { From 74869993b03fb4190228f95cc8d72e41892d7ac4 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 3 Apr 2021 01:59:02 +1100 Subject: [PATCH 03/14] Formatting errors --- package-lock.json | 1 + package.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 48a279f..269e011 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "news-server", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index b81eed2..1773ca0 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "start": "node server/server.js", "dev": "npm run watch:server", "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'", - "docker": "npm run docker:build && npm run docker:push", - "docker:build": "docker buildx build . --platform amd64 --tag docker.krgamestudios.com/krgamestudios/01-news:latest", - "docker:push": "docker push docker.krgamestudios.com/krgamestudios/01-news:latest" + "docker": "npm run docker:build && npm run docker:push", + "docker:build": "docker buildx build . --platform amd64 --tag docker.krgamestudios.com/krgamestudios/01-news:latest", + "docker:push": "docker push docker.krgamestudios.com/krgamestudios/01-news:latest" }, "repository": { "type": "git", From 028bcc99ddd49d89c107b5ea7194cda240f24919 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 3 Apr 2021 02:11:02 +1100 Subject: [PATCH 04/14] Tweaked Dockerfile --- Dockerfile | 3 +-- configure-script.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3d1ea3..b749813 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,8 @@ FROM node:15 WORKDIR "/app" COPY package*.json ./ -RUN npm install --production COPY . /app EXPOSE 3100 USER node ENTRYPOINT ["bash", "-c"] -CMD ["sleep 10 && npm start"] +CMD ["npm install --production && sleep 10 && npm start"] diff --git a/configure-script.js b/configure-script.js index d4ed41c..d3c8854 100644 --- a/configure-script.js +++ b/configure-script.js @@ -112,12 +112,11 @@ networks: FROM node:15 WORKDIR "/app" COPY package*.json ./ -RUN npm install --production COPY . /app EXPOSE ${appPort} USER node ENTRYPOINT ["bash", "-c"] -CMD ["sleep 10 && npm start"] +CMD ["npm install --production && sleep 10 && npm start"] `; const sqlfile = ` From 7ebced9304afffdc141087468399ef72b2668da1 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 3 Apr 2021 02:34:40 +1100 Subject: [PATCH 05/14] Tweaked Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b749813..82502cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM node:15 WORKDIR "/app" COPY package*.json ./ COPY . /app +RUN "npm install --production" EXPOSE 3100 USER node ENTRYPOINT ["bash", "-c"] -CMD ["npm install --production && sleep 10 && npm start"] +CMD ["sleep 10 && npm start"] From 4ff507b0fa2d5d050fa4922a9c75f2453fd405f5 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 3 Apr 2021 03:26:36 +1100 Subject: [PATCH 06/14] Funky config stuff gives me a headache --- Dockerfile | 2 +- configure-script.js | 3 ++- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82502cc..f96ed25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM node:15 WORKDIR "/app" COPY package*.json ./ COPY . /app -RUN "npm install --production" +RUN npm install --production EXPOSE 3100 USER node ENTRYPOINT ["bash", "-c"] diff --git a/configure-script.js b/configure-script.js index d3c8854..9791617 100644 --- a/configure-script.js +++ b/configure-script.js @@ -113,10 +113,11 @@ FROM node:15 WORKDIR "/app" COPY package*.json ./ COPY . /app +RUN npm install --production EXPOSE ${appPort} USER node ENTRYPOINT ["bash", "-c"] -CMD ["npm install --production && sleep 10 && npm start"] +CMD ["sleep 10 && npm start"] `; const sqlfile = ` diff --git a/package.json b/package.json index 1773ca0..58fd942 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "dev": "npm run watch:server", "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'", "docker": "npm run docker:build && npm run docker:push", - "docker:build": "docker buildx build . --platform amd64 --tag docker.krgamestudios.com/krgamestudios/01-news:latest", + "docker:build": "docker buildx build . --platform linux/amd64 --tag docker.krgamestudios.com/krgamestudios/01-news:latest", "docker:push": "docker push docker.krgamestudios.com/krgamestudios/01-news:latest" }, "repository": { From 70712b9a87bac53f1f56f3b457e93886d627375a Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 7 Apr 2021 02:00:05 +1000 Subject: [PATCH 07/14] Ripped out unneeded stuff --- .github/workflows/docker.yml | 39 ---------- LICENSE | 11 --- configure-script.js | 135 ----------------------------------- package-lock.json | 1 - package.json | 1 - server/server.js | 3 +- test/dev-news-requests.rest | 33 --------- test/requests.rest | 54 -------------- 8 files changed, 1 insertion(+), 276 deletions(-) delete mode 100644 .github/workflows/docker.yml delete mode 100644 LICENSE delete mode 100644 configure-script.js delete mode 100644 test/dev-news-requests.rest delete mode 100644 test/requests.rest diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index 91af0cc..0000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Publish Docker image -on: - release: - types: [ published ] - push: - tags: - - v1.* -jobs: - push_to_registry: - name: Push Docker Image to Docker Hub - runs-on: ubuntu-latest - steps: - - name: Check Out The Repo - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Get Smart Tag - id: prepare - uses: Surgo/docker-smart-tag-action@v1 - with: - docker_image: krgamestudios/news-server - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Push to Docker Hub - uses: docker/build-push-action@v2 - with: - push: true - tags: ${{ steps.prepare.outputs.tag }} - platforms: amd64,arm diff --git a/LICENSE b/LICENSE deleted file mode 100644 index be733db..0000000 --- a/LICENSE +++ /dev/null @@ -1,11 +0,0 @@ -Copyright (c) 2021 Kayne Ruse, KR Game Studios - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source distribution. diff --git a/configure-script.js b/configure-script.js deleted file mode 100644 index 9791617..0000000 --- a/configure-script.js +++ /dev/null @@ -1,135 +0,0 @@ -//setup -const readline = require('readline'); -const fs = require('fs'); -const crypto = require("crypto"); - -const uuid = (bytes = 16) => crypto.randomBytes(bytes).toString("hex"); - -const rl = readline.createInterface({ - input: process.stdin, - output: process.stdout, - terminal: false -}); - -//manually promisify this (util didn't work) -const question = (prompt, def = null) => { - return new Promise((resolve, reject) => { - rl.question(`${prompt}${def ? ` (${def})` : ''}: `, answer => { - //loop on required - if (def === null && !answer) { - return resolve(question(prompt, def)); - } - - return resolve(answer || def); - }); - }); -}; - -//questions -(async () => { - //project configuration - const appName = await question('App Name', 'news'); - const appWebAddress = await question('Web Addr', `${appName}.example.com`); - const appPort = await question('App Port', '3100'); - - const appDBUser = await question('DB User', appName); - const appDBPass = await question('DB Pass', uuid()); - const dbRootPass = await question('DB Root Pass'); - - const appSecretAccess = await question('Access Token Secret', uuid(32)); - - const supportEmail = await question('Support Email', 'example@example.com'); - - //generate the files - const ymlfile = ` -version: '3' - -services: - ${appName}: - build: - context: . - ports: - - "${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}" - environment: - - WEB_PORT=${appPort} - - DB_HOSTNAME=database - - DB_DATABASE=${appName} - - DB_USERNAME=${appDBUser} - - DB_PASSWORD=${appDBPass} - - DB_TIMEZONE=Australia/Sydney - - QUERY_LIMIT=10 - - SECRET_ACCESS=${appSecretAccess} - networks: - - app-network - depends_on: - - database - database: - image: mariadb:latest - environment: - MYSQL_DATABASE: ${appName} - MYSQL_USER: ${appDBUser} - MYSQL_PASSWORD: ${appDBPass} - MYSQL_ROOT_PASSWORD: ${dbRootPass} - networks: - - app-network - volumes: - - ./mysql:/var/lib/mysql - - ./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro - traefik_${appName}: - container_name: ${appName}_traefik - image: "traefik:v2.4" - 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" - ports: - - "80:80" - - "443:443" - volumes: - - "./letsencrypt:/letsencrypt" - - "/var/run/docker.sock:/var/run/docker.sock:ro" - networks: - - app-network -networks: - app-network: - driver: bridge -`; - - const dockerfile = ` -FROM node:15 -WORKDIR "/app" -COPY package*.json ./ -COPY . /app -RUN npm install --production -EXPOSE ${appPort} -USER node -ENTRYPOINT ["bash", "-c"] -CMD ["sleep 10 && npm start"] -`; - - const sqlfile = ` -CREATE DATABASE IF NOT EXISTS ${appName}; -CREATE USER IF NOT EXISTS '${appDBUser}'@'%' IDENTIFIED BY '${appDBPass}'; -GRANT ALL PRIVILEGES ON ${appName}.* TO '${appDBUser}'@'%'; -`; - - fs.writeFileSync('docker-compose.yml', ymlfile); - fs.writeFileSync('Dockerfile', dockerfile); - fs.writeFileSync('startup.sql', sqlfile); -})() - .then(() => rl.close()) - .catch(e => console.error(e)) -; diff --git a/package-lock.json b/package-lock.json index 269e011..6eb92cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "body-parser": "^1.19.0", "cors": "^2.8.5", "dotenv": "^8.2.0", "express": "^4.17.1", diff --git a/package.json b/package.json index 58fd942..9c68257 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ }, "homepage": "https://github.com/krgamestudios/news-server#readme", "dependencies": { - "body-parser": "^1.19.0", "cors": "^2.8.5", "dotenv": "^8.2.0", "express": "^4.17.1", diff --git a/server/server.js b/server/server.js index fa7f507..e823067 100644 --- a/server/server.js +++ b/server/server.js @@ -5,11 +5,10 @@ require('dotenv').config(); const express = require('express'); const app = express(); const server = require('http').Server(app); -const bodyParser = require('body-parser'); const cors = require('cors'); //config -app.use(bodyParser.json()); +app.use(express.json()); app.use(cors()); //database connection diff --git a/test/dev-news-requests.rest b/test/dev-news-requests.rest deleted file mode 100644 index 12db194..0000000 --- a/test/dev-news-requests.rest +++ /dev/null @@ -1,33 +0,0 @@ -#Query -GET https://dev-news.eggtrainer.com/news HTTP/1.1 - -### - -#Publish -POST https://dev-news.eggtrainer.com/news HTTP/1.1 -Content-Type: application/json -Authorization: Bearer - -{ - "title": "Hello World", - "author": "Kayne Ruse", - "body": "Lorem ipsum." -} - -### - -#Edit -PATCH https://dev-news.eggtrainer.com/news/1 HTTP/1.1 -Content-Type: application/json -Authorization: Bearer - -{ - "title": "Goodnight World" -} - -### - -#Delete -DELETE https://dev-news.eggtrainer.com/news/1 HTTP/1.1 -Content-Type: application/json -Authorization: Bearer diff --git a/test/requests.rest b/test/requests.rest deleted file mode 100644 index 7563224..0000000 --- a/test/requests.rest +++ /dev/null @@ -1,54 +0,0 @@ -#Login to the auth-server -POST http://127.0.0.1:3200/auth/login HTTP/1.1 -Content-Type: application/json - -{ - "email": "kayneruse@gmail.com", - "password": "helloworld" -} - -### - -#Refresh from the auth-server -POST http://127.0.0.1:3200/auth/token HTTP/1.1 -Content-Type: application/json - -{ - "token": "" -} - -### - -#Query -GET http://127.0.0.1:3100/news HTTP/1.1 - -### - -#Publish -POST http://127.0.0.1:3100/news HTTP/1.1 -Content-Type: application/json -Authorization: Bearer - -{ - "title": "Hello World", - "author": "Kayne Ruse", - "body": "Lorem ipsum dolor sit amet..." -} - -### - -#Edit -PATCH http://127.0.0.1:3100/news/5 HTTP/1.1 -Content-Type: application/json -Authorization: Bearer - -{ - "title": "Goodnight World" -} - -### - -#Delete -DELETE http://127.0.0.1:3100/news/4 HTTP/1.1 -Content-Type: application/json -Authorization: Bearer From f59fc2e8e03624bc66179607369328cb6ffbfee6 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 7 Apr 2021 02:44:13 +1000 Subject: [PATCH 08/14] Tweaked .envdev --- .envdev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.envdev b/.envdev index d9605f5..6d5a388 100644 --- a/.envdev +++ b/.envdev @@ -3,7 +3,7 @@ WEB_PORT=3100 DB_HOSTNAME=database DB_DATABASE=news DB_USERNAME=news -DB_PASSWORD=charizard +DB_PASSWORD=venusaur # Select a "TZ database name" that suits your needs: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones DB_TIMEZONE=Australia/Sydney From c38f700e93b284b2b678733202797750d6fe9b70 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 10 Apr 2021 04:59:03 +1000 Subject: [PATCH 09/14] Tweaked package.json --- package.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 9c68257..8e3c4a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "news-server", + "name": "01-news", "version": "1.0.0", - "description": "An API centric news server. Uses Sequelize and mariaDB by default.", + "description": "", "main": "server/server.js", "scripts": { "start": "node server/server.js", @@ -13,14 +13,10 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/krgamestudios/news-server.git" + "url": "https://gitea.krgamestudios.com/krgamestudios/01-news.git" }, "author": "Kayne Ruse", "license": "ISC", - "bugs": { - "url": "https://github.com/krgamestudios/news-server/issues" - }, - "homepage": "https://github.com/krgamestudios/news-server#readme", "dependencies": { "cors": "^2.8.5", "dotenv": "^8.2.0", From 733927966a5d5d1affbc795ad4cc306aed2fa20d Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 16 Apr 2021 13:24:03 +1000 Subject: [PATCH 10/14] Added .dockerignore --- .dockerignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..c82437f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git + +tools \ No newline at end of file From 5d721ddea67f92e4c2eabe27eec1b7020eca6be2 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 16 Apr 2021 16:24:58 +1000 Subject: [PATCH 11/14] Updated .dockerignore --- .dockerignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index c82437f..8d8dcf6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,5 @@ -.git +.git* -tools \ No newline at end of file +tools* +mysql* +letsencrypt* From 5d61cf3cdc7e6b92fb58ece63e5c697ee6c587c8 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Tue, 20 Apr 2021 18:49:53 +1000 Subject: [PATCH 12/14] Updated modules --- package-lock.json | 80 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6eb92cf..fdb69f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,10 @@ { - "name": "news-server", + "name": "01-news", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "news-server", "version": "1.0.0", "license": "ISC", "dependencies": { @@ -47,9 +46,9 @@ "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==" }, "node_modules/@types/node": { - "version": "14.14.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz", - "integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==" + "version": "14.14.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz", + "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==" }, "node_modules/abbrev": { "version": "1.1.1", @@ -158,9 +157,9 @@ "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, "node_modules/anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -176,9 +175,9 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "node_modules/balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, "node_modules/binary-extensions": { @@ -360,7 +359,6 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -1247,19 +1245,19 @@ } }, "node_modules/mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", + "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.29", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", - "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", + "version": "2.1.30", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", + "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", "dependencies": { - "mime-db": "1.46.0" + "mime-db": "1.47.0" }, "engines": { "node": ">= 0.6" @@ -1473,9 +1471,9 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "node_modules/picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", + "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", "dev": true, "engines": { "node": ">=8.6" @@ -2140,9 +2138,9 @@ "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==" }, "@types/node": { - "version": "14.14.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz", - "integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==" + "version": "14.14.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz", + "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==" }, "abbrev": { "version": "1.1.1", @@ -2229,9 +2227,9 @@ "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -2244,9 +2242,9 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, "binary-extensions": { @@ -3089,16 +3087,16 @@ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==" + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", + "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==" }, "mime-types": { - "version": "2.1.29", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", - "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", + "version": "2.1.30", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", + "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", "requires": { - "mime-db": "1.46.0" + "mime-db": "1.47.0" } }, "mimic-response": { @@ -3260,9 +3258,9 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", + "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", "dev": true }, "please-upgrade-node": { From 8504017cf7602fb3eeb0087146582e27b596fd52 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 28 Apr 2021 21:28:29 +1000 Subject: [PATCH 13/14] Updated packages --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdb69f0..8015f90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,9 +46,9 @@ "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==" }, "node_modules/@types/node": { - "version": "14.14.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz", - "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==" + "version": "14.14.43", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.43.tgz", + "integrity": "sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==" }, "node_modules/abbrev": { "version": "1.1.1", @@ -2138,9 +2138,9 @@ "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==" }, "@types/node": { - "version": "14.14.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz", - "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==" + "version": "14.14.43", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.43.tgz", + "integrity": "sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==" }, "abbrev": { "version": "1.1.1", From 5c9ee58f41eced787194669029e3446b75361c59 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 23 Jul 2021 19:12:21 +1000 Subject: [PATCH 14/14] Updated .dockerignore --- .dockerignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.dockerignore b/.dockerignore index 8d8dcf6..3b0902b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,5 @@ tools* mysql* letsencrypt* + +.env* \ No newline at end of file