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

cisagovbot · 2022-11-22T00:31:10Z

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/cyhy-commander-docker.git cyhy-commander-docker
cd cyhy-commander-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 .github/dependabot.yml README.md 
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

This will run the Go tool `goimports` against the repository if it contains any Go files. This tool bundles the functionality of `go fmt` with the additional benefit of sorting Go imports much like the isort tool we use for Python code.

@mcdonnnj

This is a temporary fix until @mcdonnnj has his PR approved and merged into the terraform-docs repo. This fix will perform a shallow clone of his forked branch, build the binary, and install it.

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

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

PATH is handled by `setup-go` so we can refactor the code setting it. Also we are taking advantage of the -C switch to handle building from the cloned repository. Co-authored-by: Nick <[email protected]>

`TODO` was placed on the wrong comment block. Also I am adding a link to the issue for the TODO.

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

This commit is introducing 2 new flags into the setup-env script. -l or --list-versions will list available Python versions and allow the user to select a version interactively. The second flag -v or --version will allow a user to set the version if installed. (e.g. ./setup-env -v 3.9.6)

This makes the code a bit cleaner and still accomplishes the same functionality Co-authored-by: Shane Frasier <[email protected]>

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

If the Python version exists then we want the script to continue execution.

pyenv local is run below.

If PYTHON_VERSION is an empty string then the system Python will be used.

This will explicitly define the name for the Compose project.

Ensure that all of the keys in the Compose file are sorted alphabetically.

The value for the `published` key in a `ports` definition is expected to be a string.

Using `compose` instead of `docker-compose` is now the preferred default for Docker Compose files.

Make wording in note more precise

…format Update Docker Compose file

Remove functionality to create special buildx Dockerfile

…mver-pin Add a comment explaining why we pin `semver`

Use the peter-evans/dockerhub-description Action to update the Docker Hub description instead of a bash script.

Instead of updating the description whenever the `build` workflow is run we will only update the description on `push` events to the `develop` branch. This will ensure that only approved edits are pushed to Docker Hub.

…r_hub_update Use a GitHub Action to update the Docker Hub description

This replaces a nonexistent input name with the valid one.

Correct input to the `peter-evans/dockerhub-description` Action

Bump the following package versions: - pip from 24.3.1 to 25.0.1 - pipenv from 2024.4.0 to 2024.4.1 - setuptools from 75.6.0 to 75.8.0

Update the dependencies installed in the Python virtual environment by running `pipenv lock` in the `src/` directory.

…ncies Update image dependencies

Instead of comparing the project version and the version read from the container log directly as strings it makes sense to parse them and contextually compare them. This is important if you are comparing, for example, a Python package version that should match the Docker image, but the Docker image has a build identifier (ex: `1.0.0` and `1.0.0+build.1`). The version should be considered equivalent in this scenario if a project is properly following SemVer versioning.

…on_comparisons Use the `semver` package to parse the log version in testing

Instead of overriding the context and file we can allow the Action to fall back on its default behaviour of using the `git` context to pull the source needed to build the image. This also allows us to remove the actions/checkout Action from the `build` and `build-push-all` jobs.

This instructs prettier to ignore `*.lock` files since they are just JSON files and will be formatted by the pretty-format-json hook.

…ld_jobs Use `docker/build-push-action` default behavior

Add a missing ignore for prettier

cisagovbot assigned dav3r, felddy, jsf9k and mcdonnnj Nov 22, 2022

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Nov 22, 2022

jmorrowomni force-pushed the lineage/skeleton branch from 8197f79 to 654f005 Compare March 2, 2023 12:37

jsf9k unassigned felddy, dav3r and mcdonnnj Jul 28, 2023

jsf9k assigned felddy, jasonodoom, dav3r and mcdonnnj and unassigned jsf9k Dec 6, 2023

mcdonnnj and others added 16 commits January 19, 2024 06:04

Add ATX Header Support for terraform-docs

f6d9d6e

This is a temporary fix until @mcdonnnj has his PR approved and merged into the terraform-docs repo. This fix will perform a shallow clone of his forked branch, build the binary, and install it.

Add prepended names to variables to describe their function

544e478

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

Remove unnecessary capitalizations and fix grammar

f5fa0ff

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

Simplify steps in the build/install portion of workflow

36361dd

PATH is handled by `setup-go` so we can refactor the code setting it. Also we are taking advantage of the -C switch to handle building from the cloned repository. Co-authored-by: Nick <[email protected]>

Add TODO label

3711ebe

Move TODO and add link to the issue

d114fb4

`TODO` was placed on the wrong comment block. Also I am adding a link to the issue for the TODO.

Alphabetize switches

c907cfc

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

Add /dev/null and remove TMPFILE

c10929a

This makes the code a bit cleaner and still accomplishes the same functionality Co-authored-by: Shane Frasier <[email protected]>

Place flags in the correct order for -r and -p

adada40

Remove unneccessary spacing

1861b9b

Alphabetize flags and descriptions

3f623e4

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

Move misplaced exit

9497dc2

If the Python version exists then we want the script to continue execution.

Remove premature pyenv local command

e1d0f28

pyenv local is run below.

Include PYTHON_VERSION when running pyenv virtualenv

517b336

If PYTHON_VERSION is an empty string then the system Python will be used.

mcdonnnj and others added 30 commits February 3, 2025 01:37

Add a name property

72783dd

This will explicitly define the name for the Compose project.

Sort Compose file keys

55f898f

Ensure that all of the keys in the Compose file are sorted alphabetically.

Force string typing for a Compose value

9513ebc

The value for the `published` key in a `ports` definition is expected to be a string.

Rename Docker Compose file

7c0da35

Using `compose` instead of `docker-compose` is now the preferred default for Docker Compose files.

Merge pull request #209 from cisagov/documentation/improve-wording

e42ea25

Make wording in note more precise

Merge pull request #210 from cisagov/improvement/update_compose_file_…

dfbbe4c

…format Update Docker Compose file

Merge pull request #211 from cisagov/improvement/remove_buildx_scripting

dfeb249

Remove functionality to create special buildx Dockerfile

Merge pull request #208 from cisagov/documentation/add-comment-for-se…

eafe720

…mver-pin Add a comment explaining why we pin `semver`

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

5380312

Use a GitHub Action to update the Docker Hub description

c3cf7b4

Use the peter-evans/dockerhub-description Action to update the Docker Hub description instead of a bash script.

Limit when the Docker Hub description is updated

6c655fc

Instead of updating the description whenever the `build` workflow is run we will only update the description on `push` events to the `develop` branch. This will ensure that only approved edits are pushed to Docker Hub.

Merge pull request #213 from cisagov/improvement/use_action_for_docke…

797859d

…r_hub_update Use a GitHub Action to update the Docker Hub description

Correct input to peter-evans/dockerhub-description Action

05c413a

This replaces a nonexistent input name with the valid one.

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

1c69160

Merge pull request #214 from cisagov/bug/fix_action_input

9ad5df4

Correct input to the `peter-evans/dockerhub-description` Action

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

ddf930d

Bump Alpine Linux from 3.20 to 3.21

058ed0f

Bump Python from 3.12.1 to 3.12.2

c5a0325

Update Dockerfile Python dependencies

228f06a

Bump the following package versions: - pip from 24.3.1 to 25.0.1 - pipenv from 2024.4.0 to 2024.4.1 - setuptools from 75.6.0 to 75.8.0

Update Python virtual environment dependencies

99bb46d

Update the dependencies installed in the Python virtual environment by running `pipenv lock` in the `src/` directory.

Merge pull request #215 from cisagov/maintenance/update_image_depende…

e8ec18b

…ncies Update image dependencies

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

b3aae9d

Merge pull request #216 from cisagov/improvement/use_semver_for_versi…

0a2e987

…on_comparisons Use the `semver` package to parse the log version in testing

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

2125214

Add a missing ignore directive for prettier

9f30d47

This instructs prettier to ignore `*.lock` files since they are just JSON files and will be formatted by the pretty-format-json hook.

Merge pull request #217 from cisagov/improvement/streamline_image_bui…

f85efbb

…ld_jobs Use `docker/build-push-action` default behavior

Merge pull request #218 from cisagov/bug/add_missing_ignore

7320dad

Add a missing ignore for prettier

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

53d87f1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Nov 22, 2022

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

Are you sure you want to change the base?

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

Conversation

cisagovbot commented Nov 22, 2022

Lineage Pull Request: CONFLICT

How to resolve the conflicts