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

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

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 [email protected]:cisagov/postfix-docker.git postfix-docker
cd postfix-docker
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 README.md docker-compose.yml 
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. <[email protected]>

* 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 <[email protected]>

Co-authored-by: Nick M. <[email protected]>

Co-authored-by: Hillary <[email protected]>

* 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 <[email protected]>

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 <[email protected]>

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

…ting

Update markdownlint Configuration

…ting

…-for-linting Install terraform and packer for the linting job

…_shfmt Replace beautysh hook with cisagov/pre-commit-shfmt

Update to reflect the new pre-commit configuration.

⚠️ CONFLICT! Lineage pull request for: skeleton

…tion

…onfiguration Standardize the Layout of the Lineage Configuration File

# Conflicts: # .github/lineage.yml # .github/workflows/build.yml

Update the Pin for actions/github-script to v4

Use preferred capitalization for Docker and Docker Hub

# Conflicts: # README.md # tests/conftest.py

"username" is changed to "user" in this function to work around a CodeQL failure for "Clear-text logging of sensitive information".

mcdonnnj

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. <[email protected]>

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 <[email protected]>

Update README.md

267e56b

Co-authored-by: Hillary <[email protected]>

Update README.md

d0d474c

Co-authored-by: Hillary <[email protected]>

Update README.md

d58e50c

Co-authored-by: Hillary <[email protected]>

Update README.md

c8ea902

Co-authored-by: Hillary <[email protected]>

Update README.md

f014b4c

Co-authored-by: Nick M. <[email protected]>

Update README.md

4df9da2

Co-authored-by: Hillary <[email protected]>

Update README.md

2c06a69

Co-authored-by: Hillary <[email protected]>

Update README.md

6a11d94

Co-authored-by: Hillary <[email protected]>

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 <[email protected]>

Update README.md

d405a76

Co-authored-by: Shane Frasier <[email protected]>

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

jsf9k and others added 18 commits July 19, 2021 13:03

Merge branch 'develop' into improvement/install-tf-and-packer-for-lin…

f6ad0e9

…ting

Merge pull request #79 from cisagov/improvement/update_mdl_configuration

382c39c

Update markdownlint Configuration

Merge branch 'develop' into improvement/install-tf-and-packer-for-lin…

3e3b918

…ting

Merge pull request #82 from cisagov/improvement/install-tf-and-packer…

0e4fc41

…-for-linting Install terraform and packer for the linting job

Merge branch 'develop' into improvement/replace_beautysh_with_shfmt

3e83a80

Merge pull request #84 from cisagov/improvement/replace_beautysh_with…

81cdb4d

…_shfmt Replace beautysh hook with cisagov/pre-commit-shfmt

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

a5e938a

Satisfy pre-commit hooks

6ad71a8

Update to reflect the new pre-commit configuration.

Merge pull request #66 from cisagov/lineage/skeleton

78450f5

⚠️ CONFLICT! Lineage pull request for: skeleton

Merge branch 'develop' into improvement/standardize_lineage_configura…

22951ea

…tion

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

0f98fd6

…onfiguration Standardize the Layout of the Lineage Configuration File

Merge branch 'develop' into update/bump_github-script_to_v4

fa87fbb

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

a73c8c9

# Conflicts: # .github/lineage.yml # .github/workflows/build.yml

Merge pull request #63 from cisagov/update/bump_github-script_to_v4

d10c669

Update the Pin for actions/github-script to v4

Merge branch 'develop' into dav3r-patch-1

9c8bc18

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

8055509

Merge pull request #65 from cisagov/dav3r-patch-1

c6aa7f0

Use preferred capitalization for Docker and Docker Hub

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

d6caf9b

# Conflicts: # README.md # tests/conftest.py

dav3r mentioned this pull request Aug 5, 2021

Minimize chances of unintentionally committing secrets cisagov/skeleton-docker#68

Open

2 tasks

dav3r added 5 commits August 5, 2021 11:32

Resolve merge conflicts

57033f8

Merge remote-tracking branch 'skeleton-docker/develop'

dc61277

Satisfy shfmt

0151f3e

Merge branch 'develop' into lineage/skeleton

f1b437c

Appease CodeQL

8dff8d4

"username" is changed to "user" in this function to work around a CodeQL failure for "Clear-text logging of sensitive information".

jsf9k approved these changes Aug 5, 2021

View reviewed changes

dav3r requested review from mcdonnnj and removed request for hillaryj August 6, 2021 14:09

mcdonnnj approved these changes Aug 10, 2021

View reviewed changes

dav3r merged commit 55b367b into develop Aug 10, 2021

dav3r deleted the lineage/skeleton branch August 10, 2021 19:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jun 3, 2021 •

edited by dav3r

Loading

mcdonnnj left a comment

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

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

Conversation

cisagovbot commented Jun 3, 2021 • edited by dav3r Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

mcdonnnj left a comment

Choose a reason for hiding this comment

cisagovbot commented Jun 3, 2021 •

edited by dav3r

Loading