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

# Conflicts:
#	requirements-dev.txt
#	tests/container_test.py

requirements-dev.txt

@@ -5,6 +5,9 @@ mypy
 semver
 =======
 pipenv
+<<<<<<< HEAD
 # The bump-version script requires at least version 3 of semver.
 semver>=3
 >>>>>>> 0d48ebd47a28a887868ea3093e675e95f3843561
+=======
+>>>>>>> 0a2e987b9184ecff808992e27f4898ddc7cc5d22

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

tests/container_test.py

@@ -10,7 +10,13 @@
 # Standard Python Libraries
 import os
 
+<<<<<<< HEAD
 # import time
+=======
+# Third-Party Libraries
+import pytest
+from semver import parse_version_info
+>>>>>>> 0a2e987b9184ecff808992e27f4898ddc7cc5d22
 
 # import pytest
 
@@ -135,9 +141,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}"