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

⚠️ CONFLICT! Lineage pull request for: skeleton #65

Merged
merged 21 commits into from
Feb 13, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0bb91c5
Update pre-commit hooks
mcdonnnj Jan 31, 2023
0eda781
Merge pull request #124 from cisagov/maintenance/update_pre-commit_hooks
jmorrowomni Feb 2, 2023
88f46b4
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Feb 2, 2023
313e792
Add a security label
jsf9k Feb 2, 2023
b7c0a75
Merge pull request #125 from cisagov/improvement/add-security-label
jmorrowomni Feb 2, 2023
c4793c9
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Feb 2, 2023
2ae1d5b
Merge pull request #149 from cisagov/lineage/skeleton
jmorrowomni Feb 10, 2023
da15398
Add package write permission to workflow
jsf9k Dec 6, 2022
3c9fc65
Merge pull request #144 from cisagov/bugfix/add-package-permission
jmorrowomni Feb 10, 2023
4e5287f
Update wheel along with pip and setuptools
jsf9k Dec 3, 2022
d4f2e48
Merge pull request #143 from cisagov/improvement/update-wheel
jmorrowomni Feb 10, 2023
83beae5
Specify pip3
jmorrowomni Feb 10, 2023
c43af0b
Merge pull request #142 from cisagov/improvement/specify-python3
jmorrowomni Feb 10, 2023
d6bf3c0
Specify the default group to run under in the Dockerfile
jsf9k Nov 22, 2022
83baee5
Merge pull request #141 from cisagov/improvement/specify-group
jmorrowomni Feb 10, 2023
73a526f
Bump docker/build-push-action from 3 to 4
dependabot[bot] Feb 10, 2023
75482de
Merge pull request #151 from cisagov/dependabot/github_actions/docker…
jmorrowomni Feb 11, 2023
7aab074
Specify pip3 in the file where it got blown away by a rebase
jmorrowomni Feb 10, 2023
1f63a52
Merge pull request #154 from cisagov/improvement/update_pip3
jmorrowomni Feb 11, 2023
686a627
Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton
jmorrowomni Feb 13, 2023
3821da5
Update to the latest version of the Python3 package
jsf9k Feb 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
- color: "ef476c"
description: This issue is a request for information or needs discussion
name: question
- color: "d73a4a"
description: This issue or pull request addresses a security issue
name: security
- color: "00008b"
description: This issue or pull request adds or otherwise modifies test code
name: test
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ jobs:
run: mkdir -p dist
- name: Build image
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
build-args: |
VERSION=${{ needs.prepare.outputs.source_version }}
Expand Down Expand Up @@ -345,6 +345,10 @@ jobs:
runs-on: ubuntu-latest
needs: [lint, prepare, test]
if: github.event_name != 'pull_request'
# When Dependabot creates a PR it requires this permission in
# order to push Docker images to ghcr.io.
permissions:
packages: write
steps:
- name: Login to Docker Hub
uses: docker/login-action@v2
Expand Down Expand Up @@ -376,7 +380,7 @@ jobs:
run: ./buildx-dockerfile.sh
- name: Build and push platform images to registries
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
build-args: |
VERSION=${{ needs.prepare.outputs.source_version }}
Expand Down
22 changes: 11 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default_language_version:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-case-conflict
- id: check-executables-have-shebangs
Expand All @@ -31,7 +31,7 @@ repos:

# Text file hooks
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.32.2
rev: v0.33.0
hooks:
- id: markdownlint
args:
Expand All @@ -41,22 +41,22 @@ repos:
hooks:
- id: prettier
- repo: https://github.com/adrienverge/yamllint
rev: v1.28.0
rev: v1.29.0
hooks:
- id: yamllint
args:
- --strict

# GitHub Actions hooks
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.18.4
rev: 0.21.0
hooks:
- id: check-github-actions
- id: check-github-workflows

# pre-commit hooks
- repo: https://github.com/pre-commit/pre-commit
rev: v2.20.0
rev: v3.0.2
hooks:
- id: validate_manifest

Expand Down Expand Up @@ -98,25 +98,25 @@ repos:
name: bandit (everything else)
exclude: tests
- repo: https://github.com/psf/black
rev: 22.10.0
rev: 22.12.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
rev: 6.0.0
hooks:
- id: flake8
additional_dependencies:
- flake8-docstrings
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.990
rev: v0.991
hooks:
- id: mypy
- repo: https://github.com/asottile/pyupgrade
rev: v3.2.0
rev: v3.3.1
hooks:
- id: pyupgrade

Expand All @@ -129,7 +129,7 @@ repos:

# Terraform hooks
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.76.0
rev: v1.77.0
hooks:
- id: terraform_fmt
- id: terraform_validate
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN apk --no-cache --quiet add ${DEPS}
###
# Make sure pip, setuptools, and wheel are the latest versions
#
# Note that we use pip --no-cache-dir to avoid writing to a local
# Note that we use pip3 --no-cache-dir to avoid writing to a local
# cache. This results in a smaller final image, at the cost of
# slightly longer install times.
###
Expand All @@ -49,7 +49,7 @@ RUN pip3 install --no-cache-dir --upgrade \
###
# Install Python dependencies
#
# Note that we use pip --no-cache-dir to avoid writing to a local
# Note that we use pip3 --no-cache-dir to avoid writing to a local
# cache. This results in a smaller final image, at the cost of
# slightly longer install times.
###
Expand Down