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

Author: mcdonnnj

Diff for: requirements-dev.txt

@@ -1,5 +1,3 @@
 --requirement requirements-test.txt
 ipython
 pipenv
-# The bump-version script requires at least version 3 of semver.
-semver>=3

Diff for: requirements-test.txt

@@ -2,3 +2,5 @@
 pre-commit
 pytest
 python-on-whales
+# The bump-version script requires at least version 3 of semver.
+semver>=3

Diff for: tests/container_test.py

@@ -12,6 +12,7 @@
 
 # Third-Party Libraries
 import pytest
+from semver import parse_version_info
 
 ENV_VAR = "ECHO_MESSAGE"
 ENV_VAR_VAL = "Hello World from docker compose!"
@@ -132,9 +133,9 @@ def test_log_version(dockerc, project_version, version_container):
     """Verify the container outputs the correct version to the logs."""
     # make sure container exited if running test isolated
     dockerc.wait(version_container.id)
-    log_output = version_container.logs().strip()
-    assert (
-        log_output == project_version
+    log_version = parse_version_info(version_container.logs().strip())
+    assert log_version == parse_version_info(
+        project_version
     ), f"Container version output to log does not match project version file {VERSION_FILE}"