⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

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

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

2. Clone the repository locally, and reapply the merge:

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

3. Review the changes displayed by the status command. Fix any conflicts and
   possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the
   branch, commit, and push your changes:

   git add .github/CODEOWNERS .github/workflows/build.yml Dockerfile README.md docker-compose.yml src/version.txt tests/conftest.py tests/container_test.py 
   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.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

Remove any of the following that do not apply. If you're unsure about
any of these, don't hesitate to ask. We're here to help!

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All relevant repo and/or project documentation has been updated
  to reflect the changes in this PR.
• All new and existing tests pass.

---

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

[Copilot]

Pull Request Overview

This is a Lineage pull request that incorporates upstream changes from the skeleton-docker repository to keep the guacamole-composition project synchronized with the latest skeleton template updates.

• Updates the version format from Python-style to plain semantic versioning
• Replaces the old bump_version.sh script with a new bump-version script that provides better functionality
• Updates various configuration files, dependencies, and GitHub Actions workflows to their latest versions

Reviewed Changes

Copilot reviewed 25 out of 25 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
trivy.yml	Adds new Trivy security scanner configuration
tests/container_test.py	Removes shebang line from test file
tests/conftest.py	Adds project version fixture and constant
tag.sh	Updates script name reference from bump_version.sh to bump-version
src/version.txt	Changes version format from Python-style to plain semantic version
setup-env	Major update with enhanced argument parsing and Python version validation
requirements-test.txt	Adds semver dependency for version management
requirements-dev.txt	Removes semver dependency and adds pipenv
compose.yml	Removes deprecated version field and updates port syntax
bump_version.sh	Removes old version management script
bump-version	Adds new enhanced version management script
README.md	Updates badge URL and removes Snyk vulnerability badge
CONTRIBUTING.md	Updates documentation for GNU getopt requirement
.yamllint	Adds comprehensive YAML linting rules
.prettierignore	Adds *.lock to ignored files
.pre-commit-config.yaml	Updates hook versions and adds new security checks
.mdl_config.yaml	Updates YAML quoting style
.github/workflows/*	Updates GitHub Actions workflows with latest versions and security improvements
.github/lineage.yml	Fixes YAML quoting style
.github/labels.yml	Updates label color definitions
.github/dependabot.yml	Updates dependency management configuration
.github/CODEOWNERS	Updates code ownership assignments

Comments suppressed due to low confidence (1)

setup-env:1

• The += operator for string concatenation in bash is not POSIX compliant and may not work in all shell environments. Consider using explicit concatenation: local prerelease="${prerelease}(?:0|[1-9]..." or define the full string in one assignment.

#!/usr/bin/env bash

---

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

[jsf9k]

I am requesting a couple of changes, which may require upstream skeleton PRs.