Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple changes to address #1004 #1005

Merged

Conversation

david-waltermire
Copy link
Contributor

Updating Docker build configuration to fix missing calabash.
Also made docs Docker container dependent on the build container, which should ease future maintenance.
Updated readme files to address docker 20.10 compose syntax, and to add new dependencies.
Changed location of profile-resolution.html.
Resolves #1004.

Committer Notes

{Please provide a brief description of what this PR accomplishes. Be sure to reference any issues addressed. If the PR is a work-in-progress submitted for early review, please include [WIP] at the beginning of the title or mark the PR as DRAFT.}

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?
  • Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

Also made docs Docker container dependent on the build container, which should ease future maintenance.
Updated readmes to address docker 20.10 compose syntax, and to add new dependencies.
Changed location of profile-resolution.html.
Resolves usnistgov#1004.
@david-waltermire david-waltermire merged commit fdfa65b into usnistgov:main Aug 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Issues in Docker Image and Generation Scripts
1 participant