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

Switch Lineage from cisagov/skeleton-generic to cisagov/skeleton-docker #30

Merged

Conversation

mcdonnnj
Copy link
Member

🗣 Description

This pull request changes this project to be based on the cisagov/skeleton-docker project instead of cisagov/skeleton-generic.

💭 Motivation and context

Since this is a Docker project it should be based on the appropriate skeleton. Additionally this change will allow us to correctly update the image configuration and generate a new versioned image for use in deployments.

🧪 Testing

Automated tests pass.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated
    to reflect the changes in this PR.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.

jsf9k and others added 30 commits June 6, 2019 17:21
Merge in upstream changes from cisagov/skeleton-generic
…skeleton_generic

Upstream changes from cisagov/skeleton-generic
Add test to check for container readiness.
mcdonnnj and others added 14 commits June 13, 2022 10:34
…_versions

Update GitHub Action versions for this project
Update code to use the "docker compose" syntax vice "docker-compose"
These provide samples for the `aws_config` and `scraper.json` files
that this Docker image would expect.
Enable the new ignore directives for dependencies managed by
cisagov/skeleton-docker.
Update the pytest configuration to reflect this image's configuration.
This reflects the intersection of platforms supported by the base
Docker image we are using for our image and the Python packages that
will be installed for image functionality.
@mcdonnnj mcdonnnj added improvement This issue or pull request will add or improve functionality, maintainability, or ease of use upstream update This issue or pull request pulls in upstream updates labels Jun 30, 2022
@mcdonnnj mcdonnnj requested a review from dav3r as a code owner June 30, 2022 06:19
@mcdonnnj mcdonnnj self-assigned this Jun 30, 2022
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've got some questions before I approve...

.github/workflows/build.yml Show resolved Hide resolved
.pre-commit-config.yaml Show resolved Hide resolved
src/secrets/scraper.json Outdated Show resolved Hide resolved
Replace the value used for the GitHub token in the LLNL/scraper sample
configuration to be more obviously a placeholder. This value still
follows the format of GitHub Personal Access Tokens while being
obviously a placeholder.

Co-authored-by: dav3r <[email protected]>
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beautiful! 🌷

Copy link
Member

@jsf9k jsf9k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do these changes break anything here?

I took a look at cisagov/ansible-role-code-gov-update, and I think that Ansible role is OK.

@mcdonnnj
Copy link
Member Author

mcdonnnj commented Jul 5, 2022

Do these changes break anything here?

I took a look at cisagov/ansible-role-code-gov-update, and I think that Ansible role is OK.

Yes this has breaking changes for how it is deployed. I plan on creating a PR to adjust the Ansible role once the improvement/modernize_project branch (what this PR is merging into) is in a final state and before that branch is merged into develop.

@mcdonnnj mcdonnnj merged commit b7dc86d into improvement/modernize_project Aug 3, 2022
@mcdonnnj mcdonnnj deleted the improvement/change_parent_skeleton branch August 3, 2022 14:08
@mcdonnnj mcdonnnj mentioned this pull request Mar 17, 2023
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement This issue or pull request will add or improve functionality, maintainability, or ease of use upstream update This issue or pull request pulls in upstream updates
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants