⚠️ 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

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

Our standard practice for YAML files is to sort keys alphabetically. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

This updates the remaining declarations to match what was pulled down from cisagov/skeleton-generic.

Add the `diagnostics` job as a dependency for the other jobs. Reformat the dependencies for those jobs to match the formatting of the `lint` job. This aligns with what was pulled down from cisagov/skeleton-generic.

Ensure that top-level keys except for `steps` are alphabetically sorted.

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

This aligns with what was done to the `lint` job of the build.yml workflow that was inherited from cisagov/skeleton-generic.

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

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

…up-env files Co-authored-by: Nick <[email protected]>

@mcdonnnj

@mcdonnnj correctly pointed out that other projects add their own configuration files that match, e.g., the /.*.yaml pattern. We want to ensure that we only own the linter configuration files from the skeleton. Co-authored-by: Nick <[email protected]>

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps python from 3.11.4-alpine to 3.12.0-alpine. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

It's good to agree everywhere with the changes we made to the build.yml workflow in cisagov/skeleton-generic#144.

Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 2 to 3. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](hashicorp/setup-terraform@v2...v3) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

We prefer block style to flow style for sequences and mappings in YAML.

We prefer to alphabetize mapping keys in YAML documents whenever possible.

This should improve compatibility with merge queues. We configure it to only trigger on the `checks_requested` type which is currently the only supported type for this trigger. If additional types are added in the future they should be added if appropriate.

⚠️ CONFLICT! Lineage pull request for: skeleton

We can move this instruction to the end of the Dockerfile now that we are no longer working with files in the Docker container when building.

Using a virtual environment is a Python best practice. We also consolidate all of the Python dependency installation steps into a single RUN instruction. This ensures that Python setup is cached in one layer and mirrors the logical organization of this being a single step.

…eatable Pin Python package versions and improve build repeatability

This configuration includes a Pipfile configuration file and the generated Pipfile.lock file that pins to specific versions for the Python dependencies for this project. This will help us ensure repeatable builds. The pipenv package is added as a developmental requirement to support these files.

Since we cannot use long options on Alpine Linux we should explain what the short options we are using do. I also changed the order of options so that they are in alphabetical order. Co-authored-by: Shane Frasier <[email protected]>

Now that we have a pipenv configuration we will use it to install the Python dependencies for the image. The `build` workflow is updated to no longer pass the VERSION build argument in line with this change.

Use a Python virtual environment

Switch to using a multi-stage build in the Dockerfile. This reduces image size since pipenv and its dependencices are not needed in the final image. It also ensures that the system Python environment is unmodified.

Install the core Python packages (pip, setuptools, and wheel) into the system Python environment before installing pipenv. This keeps things consistent with our usual approach to Python environments.

The comment references a command that is no longer being run. Co-authored-by: Shane Frasier <[email protected]>

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

Change the tags used in the table to match the version of the project. Previously "1.2.3" was used as an example version but there is no reason not to use the real version of the image.

…tion Install Python dependencies with `pipenv`

Update the README

Update the Dockerfile and testing to accommodate changes in the new version.

Update dependencies

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

The version of Python listed in the Pipfile is updated to match the new Docker image tag.

- pip from 24.0 to 24.3.1 - pipenv from 2023.12.1 to 2024.4.0 - setuptools from 69.1.1 to 75.6.0 - wheel from 0.42.0 to 0.45.1

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

Update image dependencies

This resolves the following warning from Docker when building the image: FromAsCasing: 'as' and 'FROM' keywords' casing do not match Co-authored-by: Shane Frasier <[email protected]>

…nfiguration Update Dockerfile configuration

# Conflicts: # .github/dependabot.yml

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

mcdonnnj and others added 21 commits September 13, 2023 15:47

Remove unnecessary quotes in the dependabot configuration

d86ac5b

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

Sort the keys in the Dependabot configuration

4186c1a

Our standard practice for YAML files is to sort keys alphabetically. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

Bump actions/checkout from 3 to 4

95cb005

This updates the remaining declarations to match what was pulled down from cisagov/skeleton-generic.

Update job dependencies for the build.yml workflow

c9f43e4

Add the `diagnostics` job as a dependency for the other jobs. Reformat the dependencies for those jobs to match the formatting of the `lint` job. This aligns with what was pulled down from cisagov/skeleton-generic.

Adjust key ordering for jobs in the build.yml workflow

138fc0f

Ensure that top-level keys except for `steps` are alphabetically sorted.

Remove unnecessary quotes in the build.yml workflow

7eefae0

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

Add runner hardening to all jobs in our workflows

4380bec

This aligns with what was done to the `lint` job of the build.yml workflow that was inherited from cisagov/skeleton-generic.

Remove unnecessary quotes in the codeql-analysis.yml workflow

f0f3e11

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

Make the dev team the owners of the linter configuration files

1f611fc

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

Make dev team members the codeowners of the requirements*.txt and set…

c356768

…up-env files Co-authored-by: Nick <[email protected]>

Bump python from 3.11.4-alpine to 3.12.0-alpine

768b6cb

Bumps python from 3.11.4-alpine to 3.12.0-alpine. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Add a diagnostics job to the CodeQL workflow

8c6b096

It's good to agree everywhere with the changes we made to the build.yml workflow in cisagov/skeleton-generic#144.

Prefer block style to flow style

9f31700

We prefer block style to flow style for sequences and mappings in YAML.

Alphabetize entries in the build workflow

696433a

We prefer to alphabetize mapping keys in YAML documents whenever possible.

Merge pull request #172 from cisagov/lineage/skeleton

6bc69ce

⚠️ CONFLICT! Lineage pull request for: skeleton

mcdonnnj and others added 30 commits December 6, 2024 15:31

Move WORKDIR instruction

e6f5798

We can move this instruction to the end of the Dockerfile now that we are no longer working with files in the Docker container when building.

Merge pull request #189 from cisagov/improvement/make_builds_more_rep…

43bf47b

…eatable Pin Python package versions and improve build repeatability

Explain ln options being used

d3895ef

Since we cannot use long options on Alpine Linux we should explain what the short options we are using do. I also changed the order of options so that they are in alphabetical order. Co-authored-by: Shane Frasier <[email protected]>

Install Python dependencies using pipenv

6b869bb

Now that we have a pipenv configuration we will use it to install the Python dependencies for the image. The `build` workflow is updated to no longer pass the VERSION build argument in line with this change.

Merge pull request #190 from cisagov/improvement/use_Python_venv

30f6fa9

Use a Python virtual environment

Use a multi-stage Docker build

5cbb75b

Switch to using a multi-stage build in the Dockerfile. This reduces image size since pipenv and its dependencices are not needed in the final image. It also ensures that the system Python environment is unmodified.

Install core Python packages into the system Python environment

5dca6d9

Install the core Python packages (pip, setuptools, and wheel) into the system Python environment before installing pipenv. This keeps things consistent with our usual approach to Python environments.

Fix outdated comment in the Dockerfile

79d8de9

The comment references a command that is no longer being run. Co-authored-by: Shane Frasier <[email protected]>

Fix typo in Dockerfile comment

440ba70

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

Update image tag information in the README

78f4f78

Change the tags used in the table to match the version of the project. Previously "1.2.3" was used as an example version but there is no reason not to use the real version of the image.

Add instructions for managing Python dependencies

1774267

Merge pull request #191 from cisagov/improvement/pin_Python_configura…

704b76f

…tion Install Python dependencies with `pipenv`

Merge pull request #192 from cisagov/improvement/update_readme

11f8e08

Update the README

Bump setuptools from 69.1.0 to 69.1.1

af716cc

Bump Python from 3.12.0 to 3.12.2

a65ebdc

Bump Alpine Linux from 3.18 to 3.19

5d52367

Bump cisagov/skeleton-python-library from 0.0.1 to 0.2.0

56afca0

Update the Dockerfile and testing to accommodate changes in the new version.

Bump version from 0.0.1 to 0.2.0

ae0d4a8

Merge pull request #193 from cisagov/improvement/update_dependencies

95e533b

Update dependencies

Correct usage of the term "symlink"

965da2c

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

Bump python from 3.12.2-alpine3.19 to 3.13.1-alpine3.20

570b7d5

The version of Python listed in the Pipfile is updated to match the new Docker image tag.

Bump Python packages installed in the Dockerfile

b3c5df5

- pip from 24.0 to 24.3.1 - pipenv from 2023.12.1 to 2024.4.0 - setuptools from 69.1.1 to 75.6.0 - wheel from 0.42.0 to 0.45.1

Update Python virtual environment dependencies

c09b352

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

Merge pull request #200 from cisagov/improvement/update_dependencies

192d9e6

Update image dependencies

Add a missing Oxford comma to a comment in the Dockerfile

a1ece8f

Ensure FROM/AS keywords use the same casing

fd69f45

This resolves the following warning from Docker when building the image: FromAsCasing: 'as' and 'FROM' keywords' casing do not match Co-authored-by: Shane Frasier <[email protected]>

Merge pull request #195 from cisagov/improvement/update_Dockerfile_co…

0d48ebd

…nfiguration Update Dockerfile configuration

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

69a3f1b

# Conflicts: # .github/dependabot.yml

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