Skip to content

Commit 1cb9e84

Browse files
author
mcdonnnj
committed
Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton
# Conflicts: # .github/CODEOWNERS # .github/workflows/build.yml # Dockerfile # README.md # docker-compose.yml # requirements-dev.txt # src/Pipfile # src/Pipfile.lock # src/version.txt # tests/conftest.py # tests/container_test.py
2 parents 8fb7e9e + 0d48ebd commit 1cb9e84

20 files changed

+1030
-277
lines changed

.github/CODEOWNERS

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,26 @@
33
# These owners will be the default owners for everything in the
44
# repo. Unless a later match takes precedence, these owners will be
55
# requested for review when someone opens a pull request.
6+
<<<<<<< HEAD
67
* @dav3r @jasonodoom @jsf9k @mcdonnnj
8+
=======
9+
* @dav3r @felddy @jsf9k @mcdonnnj
10+
>>>>>>> 0d48ebd47a28a887868ea3093e675e95f3843561
711

812
# These folks own any files in the .github directory at the root of
913
# the repository and any of its subdirectories.
10-
/.github/ @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
14+
/.github/ @dav3r @felddy @jsf9k @mcdonnnj
15+
16+
# These folks own all linting configuration files.
17+
/.ansible-lint @dav3r @felddy @jsf9k @mcdonnnj
18+
/.bandit.yml @dav3r @felddy @jsf9k @mcdonnnj
19+
/.flake8 @dav3r @felddy @jsf9k @mcdonnnj
20+
/.isort.cfg @dav3r @felddy @jsf9k @mcdonnnj
21+
/.mdl_config.yaml @dav3r @felddy @jsf9k @mcdonnnj
22+
/.pre-commit-config.yaml @dav3r @felddy @jsf9k @mcdonnnj
23+
/.prettierignore @dav3r @felddy @jsf9k @mcdonnnj
24+
/.yamllint @dav3r @felddy @jsf9k @mcdonnnj
25+
/requirements.txt @dav3r @felddy @jsf9k @mcdonnnj
26+
/requirements-dev.txt @dav3r @felddy @jsf9k @mcdonnnj
27+
/requirements-test.txt @dav3r @felddy @jsf9k @mcdonnnj
28+
/setup-env @dav3r @felddy @jsf9k @mcdonnnj

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ updates:
1818
- dependency-name: actions/checkout
1919
- dependency-name: actions/setup-go
2020
- dependency-name: actions/setup-python
21+
- dependency-name: cisagov/setup-env-github-action
2122
- dependency-name: crazy-max/ghaction-dump-context
2223
- dependency-name: crazy-max/ghaction-github-labeler
2324
- dependency-name: crazy-max/ghaction-github-status
25+
- dependency-name: GitHubSecurityLab/actions-permissions
26+
- dependency-name: hashicorp/setup-packer
2427
- dependency-name: hashicorp/setup-terraform
2528
- dependency-name: mxschmitt/action-tmate
2629
- dependency-name: step-security/harden-runner

0 commit comments

Comments
 (0)