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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 21 commits into from
Feb 13, 2023
Merged

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

merged 21 commits into from
Feb 13, 2023

Commits on Jan 31, 2023

  1. Update pre-commit hooks 

    Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook
is intentionally held back to be updated independently to v6.
    @mcdonnnj
    mcdonnnj committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    0bb91c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Merge pull request #124 from cisagov/maintenance/update_pre-commit_hooks 

    Update `pre-commit` hooks
    @jmorrowomni
    jmorrowomni authored Feb 2, 2023
    Configuration menu
    Copy the full SHA
    0eda781 View commit details
    Browse the repository at this point in the history

  2. Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton

    mcdonnnj committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    88f46b4 View commit details
    Browse the repository at this point in the history

  3. Add a security label

    @jsf9k
    jsf9k committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    313e792 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #125 from cisagov/improvement/add-security-label 

    Add a security label
    @jmorrowomni
    jmorrowomni authored Feb 2, 2023
    Configuration menu
    Copy the full SHA
    b7c0a75 View commit details
    Browse the repository at this point in the history

  5. Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton

    mcdonnnj committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    c4793c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. Merge pull request #149 from cisagov/lineage/skeleton 

    Lineage pull request for: skeleton
    @jmorrowomni
    jmorrowomni authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    2ae1d5b View commit details
    Browse the repository at this point in the history

  2. Add package write permission to workflow 

    When Dependabot creates a PR it requires this permission in order to
push Docker images to ghcr.io.
    @jsf9k @jmorrowomni
    jsf9k authored and jmorrowomni committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    da15398 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #144 from cisagov/bugfix/add-package-permission 

    Add package write permission to workflow
    @jmorrowomni
    jmorrowomni authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    3c9fc65 View commit details
    Browse the repository at this point in the history

  4. Update wheel along with pip and setuptools 

    Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
    @jsf9k @mcdonnnj @jmorrowomni
    2 people authored and jmorrowomni committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    4e5287f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #143 from cisagov/improvement/update-wheel 

    Update wheel along with pip and setuptools
    @jmorrowomni
    jmorrowomni authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    d4f2e48 View commit details
    Browse the repository at this point in the history

  6. Specify pip3 

    In this case it doesn't matter because we are starting from a
Python3-specific base container, but other projects that use this
skeleton may not be.  Specifying pip3 ensures that the Python 2
version of pip is not called by mistake.
    @jmorrowomni
    jmorrowomni committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    83beae5 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #142 from cisagov/improvement/specify-python3 

    Specify pip3
    @jmorrowomni
    jmorrowomni authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    c43af0b View commit details
    Browse the repository at this point in the history

  8. Specify the default group to run under in the Dockerfile

    @jsf9k @jmorrowomni
    jsf9k authored and jmorrowomni committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    d6bf3c0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #141 from cisagov/improvement/specify-group 

    Specify the default group to run under in the Dockerfile
    @jmorrowomni
    jmorrowomni authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    83baee5 View commit details
    Browse the repository at this point in the history

  10. Bump docker/build-push-action from 3 to 4 

    Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Feb 10, 2023
    Configuration menu
    Copy the full SHA
    73a526f View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2023

  1. Merge pull request #151 from cisagov/dependabot/github_actions/docker… 

    …/build-push-action-4

Bump docker/build-push-action from 3 to 4
    @jmorrowomni
    jmorrowomni authored Feb 11, 2023
    Configuration menu
    Copy the full SHA
    75482de View commit details
    Browse the repository at this point in the history

  2. Specify pip3 in the file where it got blown away by a rebase

    @jmorrowomni
    jmorrowomni committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    7aab074 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #154 from cisagov/improvement/update_pip3 

    Specify pip3 in the file where it got blown away by a rebase
    @jmorrowomni
    jmorrowomni authored Feb 11, 2023
    Configuration menu
    Copy the full SHA
    1f63a52 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

    @jmorrowomni
    jmorrowomni committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    686a627 View commit details
    Browse the repository at this point in the history

  2. Update to the latest version of the Python3 package 

    This is version 3.10.10-r0.
    @jsf9k
    jsf9k committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    3821da5 View commit details
    Browse the repository at this point in the history