Skip to content

Commit

Permalink
chore(.prettierignore): fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
alejandrosaenz117 committed Jan 14, 2021
2 parents ff8b5b8 + ff61276 commit 953def8
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@ frontend/dist
node_modules
frontend/node_modules
.prettierignore
Dockerfile
CHANGELOG.md
# Ignore all HTML files:
*.html
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,48 @@

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)


### 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)


### 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)


### 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)


### 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

- **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
Expand Down
20 changes: 15 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM softramsdocker/bulwark-base:latest

USER root

# Environment Arguments for Bulwark
ARG MYSQL_USER
ARG MYSQL_ROOT_PASSWORD
Expand All @@ -26,17 +28,25 @@ 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
# DB Wait MySQL Status Up, requires mysql-client and python
RUN apk add --no-cache --update mysql-client \
python2

# Runas User
USER bulwark

# Bulwark Specific Startup
RUN npm install

# Cleanup NPM to save some space
RUN rm -rf /bulwark/.npm
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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<p align="center">
<img src='https://github.com/softrams/bulwark/workflows/build/badge.svg'>
<img src='https://img.shields.io/badge/License-MIT-yellow.svg'>
<img src='https://img.shields.io/docker/cloud/build/softramsdocker/bulwark'>
<img src='https://img.shields.io/docker/pulls/softramsdocker/bulwark'>
</p>

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bulwark",
"version": "6.4.2",
"version": "6.4.8",
"description": "An organizational asset and vulnerability management tool",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 953def8

Please sign in to comment.