From ca447d35d1fc9cae2efe6b8876faa34df9ed1540 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 10:03:28 -0500 Subject: [PATCH 01/13] build(dockerfile): update npm install Updated `npm install` to `npm install --production` --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 522708e5..f24f003b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN apk add --no-cache mysql-client USER bulwark # Bulwark Specific Startup -RUN npm install +RUN npm install --production # Cleanup NPM to save some space RUN rm -rf /bulwark/.npm From 3bf6e0e240db62090fb1adf4b8aa2f4f3fb78284 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 10:14:01 -0500 Subject: [PATCH 02/13] build(dockerfile): add USER ROOT --- .prettierignore | 3 ++- Dockerfile | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index 60def313..eb0b5bad 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,6 +3,7 @@ dist frontend/dist node_modules frontend/node_modules - +.prettierignore +Dockerfile # Ignore all HTML files: *.html \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f24f003b..0abbd04c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM softramsdocker/bulwark-base:latest +USER ROOT + # Environment Arguments for Bulwark ARG MYSQL_USER ARG MYSQL_ROOT_PASSWORD From 2387beefc9d01488c5c5586b325d49458c0d0747 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 10:14:26 -0500 Subject: [PATCH 03/13] chore(release): 6.4.3 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dd91377..93604a66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [6.4.3](https://github.com/softrams/bulwark/compare/v6.4.2...v6.4.3) (2021-01-14) + +### Build System + +- **dockerfile:** add USER ROOT ([3bf6e0e](https://github.com/softrams/bulwark/commit/3bf6e0e240db62090fb1adf4b8aa2f4f3fb78284)) +- **dockerfile:** update npm install ([ca447d3](https://github.com/softrams/bulwark/commit/ca447d35d1fc9cae2efe6b8876faa34df9ed1540)) + ### [6.4.2](https://github.com/softrams/bulwark/compare/v6.4.1...v6.4.2) (2021-01-12) ### Bug Fixes diff --git a/package-lock.json b/package-lock.json index dd8b5e2f..cffed5fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.2", + "version": "6.4.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e027e631..833296bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.2", + "version": "6.4.3", "description": "An organizational asset and vulnerability management tool", "main": "index.js", "scripts": { From 2f22d20fbc027e01427339fa068c3ab18ffe7f7b Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 10:36:01 -0500 Subject: [PATCH 04/13] build(dockerfile): root !== ROOT --- .prettierignore | 1 + Dockerfile | 2 +- README.md | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index eb0b5bad..38f97865 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,5 +5,6 @@ node_modules frontend/node_modules .prettierignore Dockerfile +CHANGELOG.md # Ignore all HTML files: *.html \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0abbd04c..90a3bd72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM softramsdocker/bulwark-base:latest -USER ROOT +USER root # Environment Arguments for Bulwark ARG MYSQL_USER diff --git a/README.md b/README.md index 9c81c95d..fb0069e5 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@

+

From 2a7c5771fd87f90c34d50951c90c503c24e83b5a Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 10:36:18 -0500 Subject: [PATCH 05/13] chore(release): 6.4.4 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93604a66..c6446c79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [6.4.4](https://github.com/softrams/bulwark/compare/v6.4.3...v6.4.4) (2021-01-14) + + +### Build System + +* **dockerfile:** root !== ROOT ([2f22d20](https://github.com/softrams/bulwark/commit/2f22d20fbc027e01427339fa068c3ab18ffe7f7b)) + ### [6.4.3](https://github.com/softrams/bulwark/compare/v6.4.2...v6.4.3) (2021-01-14) ### Build System diff --git a/package-lock.json b/package-lock.json index cffed5fa..1a17e47c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.3", + "version": "6.4.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 833296bc..3cd44e24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.3", + "version": "6.4.4", "description": "An organizational asset and vulnerability management tool", "main": "index.js", "scripts": { From eac63c8d4a19668f2c3f6e70445a2f43360bd51f Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 10:57:52 -0500 Subject: [PATCH 06/13] build(dockerfile): install typescript globally Added typescript installation so that docker can build application correctly --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 90a3bd72..392a4a59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,8 @@ RUN chown -R bulwark:bulwark /bulwark # DB Wait MySQL Status Up, requires mysql-client RUN apk add --no-cache mysql-client +RUN npm install typescript -g + # Runas User USER bulwark From cfc65bc38e37748c2cb095dcf6fd328a3b1bc6ee Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 10:58:00 -0500 Subject: [PATCH 07/13] chore(release): 6.4.5 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6446c79..ab7c7fe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [6.4.5](https://github.com/softrams/bulwark/compare/v6.4.4...v6.4.5) (2021-01-14) + + +### Build System + +* **dockerfile:** install typescript globally ([eac63c8](https://github.com/softrams/bulwark/commit/eac63c8d4a19668f2c3f6e70445a2f43360bd51f)) + ### [6.4.4](https://github.com/softrams/bulwark/compare/v6.4.3...v6.4.4) (2021-01-14) diff --git a/package-lock.json b/package-lock.json index 1a17e47c..9093d5c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.4", + "version": "6.4.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3cd44e24..3e7ee878 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.4", + "version": "6.4.5", "description": "An organizational asset and vulnerability management tool", "main": "index.js", "scripts": { From 70e63bab5787d5d40f81c402ea2a6653311e2e52 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 11:21:17 -0500 Subject: [PATCH 08/13] build(dockerfile): add rimraf library --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 392a4a59..d5ae36e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN chown -R bulwark:bulwark /bulwark # DB Wait MySQL Status Up, requires mysql-client RUN apk add --no-cache mysql-client -RUN npm install typescript -g +RUN npm install typescript -g && npm install rimraf -g # Runas User USER bulwark From ce5eee4283983b484f0859b42f6b24860d76f814 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 11:21:28 -0500 Subject: [PATCH 09/13] chore(release): 6.4.6 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab7c7fe9..fcae9247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [6.4.6](https://github.com/softrams/bulwark/compare/v6.4.5...v6.4.6) (2021-01-14) + + +### Build System + +* **dockerfile:** add rimraf library ([70e63ba](https://github.com/softrams/bulwark/commit/70e63bab5787d5d40f81c402ea2a6653311e2e52)) + ### [6.4.5](https://github.com/softrams/bulwark/compare/v6.4.4...v6.4.5) (2021-01-14) diff --git a/package-lock.json b/package-lock.json index 9093d5c1..2f6d0236 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.5", + "version": "6.4.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3e7ee878..eff889cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.5", + "version": "6.4.6", "description": "An organizational asset and vulnerability management tool", "main": "index.js", "scripts": { From 62244692a50beb155073192656f2a03456dc61ff Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 13:40:10 -0500 Subject: [PATCH 10/13] build(dockerfile): add python to container --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5ae36e6..cefcedb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,19 +28,20 @@ WORKDIR "bulwark" # Permissions for Bulwark RUN chown -R bulwark:bulwark /bulwark -# DB Wait MySQL Status Up, requires mysql-client -RUN apk add --no-cache mysql-client - -RUN npm install typescript -g && npm install rimraf -g +# DB Wait MySQL Status Up, requires mysql-client and python +RUN apk add --no-cache --update mysql-client \ + python2 \ + make \ + g++ \ + bash # Runas User USER bulwark # Bulwark Specific Startup -RUN npm install --production - # Cleanup NPM to save some space -RUN rm -rf /bulwark/.npm +RUN npm install \ + && rm -rf /bulwark/.npm # Running Port EXPOSE 5000 From ef627b2330fa2ea57e3d4577d9fbdb214e7bcf45 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 13:40:21 -0500 Subject: [PATCH 11/13] chore(release): 6.4.7 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcae9247..c32eccd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [6.4.7](https://github.com/softrams/bulwark/compare/v6.4.6...v6.4.7) (2021-01-14) + + +### Build System + +* **dockerfile:** add python to container ([6224469](https://github.com/softrams/bulwark/commit/62244692a50beb155073192656f2a03456dc61ff)) + ### [6.4.6](https://github.com/softrams/bulwark/compare/v6.4.5...v6.4.6) (2021-01-14) diff --git a/package-lock.json b/package-lock.json index 2f6d0236..1c14209a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.6", + "version": "6.4.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index eff889cf..b699b5f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.6", + "version": "6.4.7", "description": "An organizational asset and vulnerability management tool", "main": "index.js", "scripts": { From b6c9de185359cf3c7028492d780f670484a83f53 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 16:00:17 -0500 Subject: [PATCH 12/13] build(dockerfile): remove unneeded packages --- Dockerfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cefcedb9..ff10e5ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,10 +30,7 @@ RUN chown -R bulwark:bulwark /bulwark # DB Wait MySQL Status Up, requires mysql-client and python RUN apk add --no-cache --update mysql-client \ - python2 \ - make \ - g++ \ - bash + python2 # Runas User USER bulwark @@ -43,6 +40,14 @@ USER bulwark RUN npm install \ && rm -rf /bulwark/.npm +# Swap to root and delete python +USER root +# Clean up apk +RUN apk del python2 + +# Runas User +USER bulwark + # Running Port EXPOSE 5000 From ff612765894dfa8887a8525702731dafa2cef509 Mon Sep 17 00:00:00 2001 From: Alejandro Saenz Date: Thu, 14 Jan 2021 16:00:35 -0500 Subject: [PATCH 13/13] chore(release): 6.4.8 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c32eccd8..da70deb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [6.4.8](https://github.com/softrams/bulwark/compare/v6.4.7...v6.4.8) (2021-01-14) + + +### Build System + +* **dockerfile:** remove unneeded packages ([b6c9de1](https://github.com/softrams/bulwark/commit/b6c9de185359cf3c7028492d780f670484a83f53)) + ### [6.4.7](https://github.com/softrams/bulwark/compare/v6.4.6...v6.4.7) (2021-01-14) diff --git a/package-lock.json b/package-lock.json index 1c14209a..c6b2974c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.7", + "version": "6.4.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b699b5f9..2e3db934 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bulwark", - "version": "6.4.7", + "version": "6.4.8", "description": "An organizational asset and vulnerability management tool", "main": "index.js", "scripts": {