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

cisagovbot · 2021-06-03T16:00:37Z

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an
upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-docker.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with
your project.

The lineage/skeleton branch has one or more unresolved merge conflicts
that you must resolve before merging this pull request!

How to resolve the conflicts

Take ownership of this pull request by removing any other assignees.

Clone the repository locally, and reapply the merge:

git clone git@github.com:cisagov/gatherer.git gatherer
cd gatherer
git remote add skeleton https://github.com/cisagov/skeleton-docker.git
git remote set-url --push skeleton no_push
git switch develop
git checkout -b lineage/skeleton --track origin/develop
git pull skeleton HEAD
git status

Review the changes displayed by the status command. Fix any conflicts and
possibly incorrect auto-merges.
After resolving each of the conflicts, add your changes to the
branch, commit, and push your changes:
```
git add .github/CODEOWNERS README.md docker-compose.yml tag.sh 
git commit
git push --force --set-upstream origin lineage/skeleton
```
Note that you may append to the default merge commit message
that git creates for you, but please do not delete the existing
content. It provides useful information about the merge that is
being performed.
Wait for all the automated tests to pass.
Check the "Everything is cool" checkbox below:
- ✌️ The conflicts in this pull request have been resolved.
Mark this draft pull request "Ready for review".

Note: You are seeing this because one of this repository's maintainers has
configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

* Duplicates DockerHub tags for ghcr.io * Adds login to GitHub Container Registry using the GITHUB_TOKEN secret. * Documentation update to reflect multi-registry publication.

Co-authored-by: Nick M. <50747025+mcdonnnj@users.noreply.github.com>

* Add instructions for cross-platform builds * Clean up shields * Clean up tables for each Docker configuration item * Add section about supported tags

This should resolve the following error: Error: Workflows triggered by Dependabot on the "push" event run with read-only access. Uploading Code Scanning results requires write access. To use Code Scanning with Dependabot, please ensure you are using the "pull_request" event for this workflow and avoid triggering on the "push" event for Dependabot branches. See https://docs.github.com/en/code-security/secure-coding/configuring-code-scanning#scanning-on-push for more information on how to configure these events.

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Co-authored-by: Nick M. <50747025+mcdonnnj@users.noreply.github.com>

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

* Add a comment describing what the files does. * Add sections to organize patterns.

Due to her departure this removes hillaryj from the default CODEOWNERS we use in our projects.

The semver package is needed by the bump_version.sh script, but it is not included in requirements-dev.txt.

The version attribute has been depricated and will be removed once our systems move to a more recent release.

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Since the GitHub Actions configuration builds images on tag pushes, we should use the standard tagging script we use for the same purpose in other repositories. This will make it easier to tag, build, and push Docker images of a specific version in a standardized manner.

Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>

Hooks updated with the `pre-commit autoupdate` command. Note: The `ansible-lint` hook is intentionally being held back on 4.3.7 because of ongoing issues with the 5.x version and how we use Ansible (standalone Galaxy roles).

With the release of pyenv v2.0.0 there is a breaking change around startup logic that necessitates an update for our pyenv setup instructions. Also add a statement about how to get configuration instructions from pyenv itself.

Update pre-commit Hooks

…owners Remove User from CODEOWNERS

…ctions Update Instructions for Configuring pyenv

mcdonnnj

My only suggestion is that for any examples using a version number we use the latest version for the repository's image.

README.md

dav3r · 2021-06-14T17:06:28Z

My only suggestion is that for any examples using a version number we use the latest version for the repository's image.

The downside of that is every time we update the version, we need to update the README. Not saying I'm completely opposed to this, but I think that's why we went with 0.0.1 in the first place.

mcdonnnj · 2021-06-14T17:13:31Z

My only suggestion is that for any examples using a version number we use the latest version for the repository's image.

The downside of that is every time we update the version, we need to update the README. Not saying I'm completely opposed to this, but I think that's why we went with 0.0.1 in the first place.

I think it's 0.0.1 because that's what is pulled in from the skeleton which only has a 0.0.1 release. I know it creates more work, but I think at the minimum the "how to run this" sections should reference the latest version. Those are the most likely to be directly copy-pasted by someone coming in to use the image.

dav3r · 2021-06-14T17:22:23Z

My only suggestion is that for any examples using a version number we use the latest version for the repository's image.

The downside of that is every time we update the version, we need to update the README. Not saying I'm completely opposed to this, but I think that's why we went with 0.0.1 in the first place.

I think it's 0.0.1 because that's what is pulled in from the skeleton which only has a 0.0.1 release. I know it creates more work, but I think at the minimum the "how to run this" sections should reference the latest version. Those are the most likely to be directly copy-pasted by someone coming in to use the image.

I'm on board with this plan. To make life easier, we should modify bump_version.sh so that it updates all of the version numbers in the README when the finalize option is used.

jsf9k · 2021-06-14T17:45:54Z

My only suggestion is that for any examples using a version number we use the latest version for the repository's image.

The downside of that is every time we update the version, we need to update the README. Not saying I'm completely opposed to this, but I think that's why we went with 0.0.1 in the first place.

I think it's 0.0.1 because that's what is pulled in from the skeleton which only has a 0.0.1 release. I know it creates more work, but I think at the minimum the "how to run this" sections should reference the latest version. Those are the most likely to be directly copy-pasted by someone coming in to use the image.

Can we simply use image-name:latest and avoid having to update the README?
We should update the skeleton's README accordingly.

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

dav3r · 2021-06-14T17:52:10Z

My only suggestion is that for any examples using a version number we use the latest version for the repository's image.

The downside of that is every time we update the version, we need to update the README. Not saying I'm completely opposed to this, but I think that's why we went with 0.0.1 in the first place.

I think it's 0.0.1 because that's what is pulled in from the skeleton which only has a 0.0.1 release. I know it creates more work, but I think at the minimum the "how to run this" sections should reference the latest version. Those are the most likely to be directly copy-pasted by someone coming in to use the image.

Can we simply use image-name:latest and avoid having to update the README?

We should update the skeleton's README accordingly.

That would be much simpler. It depends how much we want to encourage people to pull in a specific version. I'm OK with using latest here.

…iner This change was discussed among @cisagov/team-ois here: #60 (review) Also correct git comments to use the imperative mood.

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

…mber-in-readme Update the README to reference the latest version of the Docker container

Co-authored-by: Nick M <50747025+mcdonnnj@users.noreply.github.com>

Add a section to the README for ports

README.md

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

README.md

This is to encourage future developers to add the appropriate information should this Docker container ever expose any ports. Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

dav3r

Rock on! 🎸

mcdonnnj

LGTM ✔ Thanks for working with my change requests!

…onfiguration Standardize the Layout of the Lineage Configuration File

…iner This change was discussed among @cisagov/team-ois here: cisagov/gatherer#60 (review) Also correct git comments to use the imperative mood.

felddy and others added 30 commits March 25, 2021 17:37

Enable container publication to GitHub Container Registry.

8e92286

* Duplicates DockerHub tags for ghcr.io * Adds login to GitHub Container Registry using the GITHUB_TOKEN secret. * Documentation update to reflect multi-registry publication.

Update .github/workflows/build.yml

27c0451

Co-authored-by: Nick M. <50747025+mcdonnnj@users.noreply.github.com>

Add better build instructions to the README.

6427dfa

* Add instructions for cross-platform builds * Clean up shields * Clean up tables for each Docker configuration item * Add section about supported tags

Update README.md

d354a54

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

267e56b

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

d0d474c

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

d58e50c

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

c8ea902

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

f014b4c

Co-authored-by: Nick M. <50747025+mcdonnnj@users.noreply.github.com>

Update README.md

4df9da2

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

2c06a69

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

6a11d94

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Improve gitignore file comments and organization.

ba49077

* Add a comment describing what the files does. * Add sections to organize patterns.

Remove user from CODEOWNERS

2c4d7a2

Due to her departure this removes hillaryj from the default CODEOWNERS we use in our projects.

Add semver package to development requirements

5fb5dbc

The semver package is needed by the bump_version.sh script, but it is not included in requirements-dev.txt.

Unquote port integers as this is now a parse error in Docker.

9938f67

Change compose specification version to match pyenv testing composition.

67f3a0c

The version attribute has been depricated and will be removed once our systems move to a more recent release.

Add context around command-line instructions for non-technical folks.

0d69636

Update README.md

3b62397

Co-authored-by: Hillary <hillary.jeffrey@trio.dhs.gov>

Update README.md

d405a76

Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>

Update pre-commit hooks

0349499

Hooks updated with the `pre-commit autoupdate` command. Note: The `ansible-lint` hook is intentionally being held back on 4.3.7 because of ongoing issues with the 5.x version and how we use Ansible (standalone Galaxy roles).

Update configuration instructions for pyenv

23b324b

With the release of pyenv v2.0.0 there is a breaking change around startup logic that necessitates an update for our pyenv setup instructions. Also add a statement about how to get configuration instructions from pyenv itself.

Merge pull request #71 from cisagov/maintenance/update_pre-commit_hooks

bd12db1

Update pre-commit Hooks

Merge branch 'develop' into maintenance/remove_user_from_codeowners

39a67fc

Merge pull request #72 from cisagov/maintenance/remove_user_from_code…

01b06c4

…owners Remove User from CODEOWNERS

Merge branch 'develop' into documentation/update_pyenv_instructions

b486037

Merge pull request #75 from cisagov/documentation/update_pyenv_instru…

02aefa1

…ctions Update Instructions for Configuring pyenv

Merge branch 'develop' into improvement/gitignore_me

e140c33

mcdonnnj approved these changes Jun 14, 2021

View reviewed changes

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

Fix capitalization

91bdb00

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

Update the README to reference the latest version of the Docker conta…

68948bb

…iner This change was discussed among @cisagov/team-ois here: #60 (review) Also correct git comments to use the imperative mood.

jsf9k mentioned this pull request Jun 15, 2021

Update the README to reference the latest version of the Docker container cisagov/skeleton-docker#62

Merged

6 tasks

jsf9k and others added 8 commits June 16, 2021 10:06

Add a section to the README for ports

d091518

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

Merge pull request #62 from cisagov/improvement/use-latest-version-nu…

ce74596

…mber-in-readme Update the README to reference the latest version of the Docker container

Document the single exposed (but non-functional) port

1f6d090

Co-authored-by: Nick M <50747025+mcdonnnj@users.noreply.github.com>

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

be5caa3

Merge pull request #61 from cisagov/documentation/add-ports-section

b1aa84c

Add a section to the README for ports

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

3a5e8a7

Update new Ports section

da941a3

Update version references to match the latest

e9109d7

jsf9k requested review from dav3r and mcdonnnj June 16, 2021 16:55

dav3r reviewed Jun 16, 2021

View reviewed changes

README.md Outdated Show resolved Hide resolved

Update a few lingering version numbers that are incorrect

f015c3f

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

dav3r reviewed Jun 16, 2021

View reviewed changes

README.md Show resolved Hide resolved

Add, but comment out, the ports boiler plate

db26544

This is to encourage future developers to add the appropriate information should this Docker container ever expose any ports. Co-authored-by: dav3r <david.redmin@trio.dhs.gov>

jsf9k requested a review from dav3r June 16, 2021 18:04

dav3r approved these changes Jun 16, 2021

View reviewed changes

mcdonnnj approved these changes Jun 28, 2021

View reviewed changes

jsf9k merged commit 82876bc into develop Jun 28, 2021

jsf9k deleted the lineage/skeleton branch June 28, 2021 18:06

cisagovbot pushed a commit that referenced this pull request Jul 22, 2021

Merge pull request #60 from cisagov/improvement/standardize_lineage_c…

0f98fd6

…onfiguration Standardize the Layout of the Lineage Configuration File

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jun 3, 2021 •

edited by jsf9k

Loading

mcdonnnj left a comment

dav3r commented Jun 14, 2021

mcdonnnj commented Jun 14, 2021

dav3r commented Jun 14, 2021

jsf9k commented Jun 14, 2021

dav3r commented Jun 14, 2021

dav3r left a comment

mcdonnnj left a comment

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

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

Conversation

cisagovbot commented Jun 3, 2021 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

mcdonnnj left a comment

Choose a reason for hiding this comment

dav3r commented Jun 14, 2021

mcdonnnj commented Jun 14, 2021

dav3r commented Jun 14, 2021

jsf9k commented Jun 14, 2021

dav3r commented Jun 14, 2021

dav3r left a comment

Choose a reason for hiding this comment

mcdonnnj left a comment

Choose a reason for hiding this comment

cisagovbot commented Jun 3, 2021 •

edited by jsf9k

Loading