Skip to content

Commit

Permalink
Minor Docker Improvements (#987)
Browse files Browse the repository at this point in the history
* Fix Dockerfile entrypoint for best practice.
* Fixes to align, docker, docker-compose, and Github Actions.
  • Loading branch information
ohsh6o authored Jul 9, 2021
1 parent be88cad commit 9107a10
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/metaschema-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
HOME_REPO: usnistgov/OSCAL
HOME_BRANCH: main
# dependency versions
SAXON_VERSION: 9.9.0-1
SAXON_VERSION: 9.9.1-3
HUGO_VERSION: 0.69.2
# build-specific environment
CONTENT_CONFIG_PATH: src/config
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
# the name of the repo
HOME_REPO: usnistgov/OSCAL
# dependency versions
SAXON_VERSION: 9.9.0-1
SAXON_VERSION: 9.9.1-3
HUGO_VERSION: 0.69.2
# build-specific environment
CONTENT_CONFIG_PATH: src/config
Expand Down
3 changes: 2 additions & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt-get update && apt-get install -y wget apt-utils libxml2-utils jq maven nodejs npm build-essential python3-pip git && apt-get clean
RUN npm install -g npm n
RUN n latest
RUN npm install -g markdown-link-check json-diff ajv-formats@"^1.5.x" ajv-cli@"^4.0.x" yaml-convert@"^1.0.x"
RUN npm install --loglevel verbose -g ajv-cli@"^4.0.x" ajv-formats@"^1.5.x" json-diff markdown-link-check yaml-convert@"^1.0.x" yargs
RUN pip3 install lxml

#RUN useradd --create-home --home-dir /home/user user
Expand All @@ -22,6 +22,7 @@ RUN dpkg -i hugo_extended_${hugoversion}_Linux-64bit.deb

#RUN chown -R user:user /home/user

ENV SAXON_VERSION ${saxonversion}
VOLUME ["/oscal"]
WORKDIR /oscal

Expand Down

0 comments on commit 9107a10

Please sign in to comment.