Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfile configuration #195

Merged
merged 38 commits into from
Dec 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b6b0b7c
Use the full identifier for source Docker images
mcdonnnj Feb 2, 2024
3b7a9cc
Install cisagov/skeleton-python-library directly
mcdonnnj Feb 20, 2024
db19706
Use a specific version of Alpine Linux
mcdonnnj Feb 13, 2024
9e6eef2
Remove unused OS package dependencies
mcdonnnj Feb 20, 2024
f419d35
Merge pull request #187 from cisagov/improvement/use_full_image_source
mcdonnnj Feb 20, 2024
c516e44
Remove package upgrading
mcdonnnj Feb 20, 2024
460eeec
Change the secret message being checks in tests
mcdonnnj Feb 20, 2024
001e85e
Pin Python packages directly installed
mcdonnnj Feb 20, 2024
e708211
Merge pull request #188 from cisagov/improvement/install_skeleton-pyt…
mcdonnnj Feb 21, 2024
48fa1a5
Prefer calling pip as a module
mcdonnnj Feb 26, 2024
e6f5798
Move WORKDIR instruction
mcdonnnj Feb 23, 2024
95d4a7a
Use a Python virtual environment in the Docker image
mcdonnnj Feb 26, 2024
43bf47b
Merge pull request #189 from cisagov/improvement/make_builds_more_rep…
mcdonnnj Feb 26, 2024
79a4adf
Add a pipenv configuration
mcdonnnj Feb 27, 2024
d3895ef
Explain `ln` options being used
mcdonnnj Feb 27, 2024
6b869bb
Install Python dependencies using pipenv
mcdonnnj Feb 28, 2024
30f6fa9
Merge pull request #190 from cisagov/improvement/use_Python_venv
mcdonnnj Feb 27, 2024
5cbb75b
Use a multi-stage Docker build
mcdonnnj Feb 28, 2024
5dca6d9
Install core Python packages into the system Python environment
mcdonnnj Feb 28, 2024
79d8de9
Fix outdated comment in the Dockerfile
mcdonnnj Feb 28, 2024
440ba70
Fix typo in Dockerfile comment
mcdonnnj Feb 28, 2024
78f4f78
Update image tag information in the README
mcdonnnj Feb 29, 2024
1774267
Add instructions for managing Python dependencies
mcdonnnj Feb 29, 2024
704b76f
Merge pull request #191 from cisagov/improvement/pin_Python_configura…
mcdonnnj Feb 28, 2024
11f8e08
Merge pull request #192 from cisagov/improvement/update_readme
mcdonnnj Mar 4, 2024
af716cc
Bump setuptools from 69.1.0 to 69.1.1
mcdonnnj Feb 28, 2024
a65ebdc
Bump Python from 3.12.0 to 3.12.2
mcdonnnj Feb 28, 2024
5d52367
Bump Alpine Linux from 3.18 to 3.19
mcdonnnj Feb 28, 2024
56afca0
Bump cisagov/skeleton-python-library from 0.0.1 to 0.2.0
mcdonnnj Feb 28, 2024
ae0d4a8
Bump version from 0.0.1 to 0.2.0
mcdonnnj Mar 4, 2024
95e533b
Merge pull request #193 from cisagov/improvement/update_dependencies
mcdonnnj Mar 5, 2024
965da2c
Correct usage of the term "symlink"
mcdonnnj Mar 13, 2024
570b7d5
Bump python from 3.12.2-alpine3.19 to 3.13.1-alpine3.20
mcdonnnj Nov 23, 2024
b3c5df5
Bump Python packages installed in the Dockerfile
mcdonnnj Nov 23, 2024
c09b352
Update Python virtual environment dependencies
mcdonnnj Nov 23, 2024
192d9e6
Merge pull request #200 from cisagov/improvement/update_dependencies
mcdonnnj Dec 6, 2024
a1ece8f
Add a missing Oxford comma to a comment in the Dockerfile
mcdonnnj Dec 6, 2024
fd69f45
Ensure FROM/AS keywords use the same casing
mcdonnnj Dec 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump cisagov/skeleton-python-library from 0.0.1 to 0.2.0
Update the Dockerfile and testing to accommodate changes in the new
version.
mcdonnnj committed Dec 6, 2024
commit 56afca0d991c05010d22981ba424e631fd88cb12
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -108,4 +108,4 @@ USER ${CISA_USER}:${CISA_GROUP}
EXPOSE 8080/TCP
VOLUME ["/var/log"]
ENTRYPOINT ["example"]
CMD ["--log-level", "DEBUG"]
CMD ["--log-level", "DEBUG", "8", "2"]
2 changes: 1 addition & 1 deletion src/Pipfile
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ name = "pypi"
# List any Python dependencies for the image here
[packages]
# This should match the version of the image
example = {file = "https://github.com/cisagov/skeleton-python-library/archive/v0.0.1.tar.gz"}
example = {file = "https://github.com/cisagov/skeleton-python-library/archive/v0.2.0.tar.gz"}

# This version should match the version of Python in the image
[requires]
19 changes: 17 additions & 2 deletions src/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tests/container_test.py
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
ENV_VAR = "ECHO_MESSAGE"
ENV_VAR_VAL = "Hello World from docker compose!"
READY_MESSAGE = "This is a debug message"
DIVISION_MESSAGE = "8 / 2 == 4.000000"
SECRET_QUOTE = "Three may keep a secret, if two of them are dead." # nosec
RELEASE_TAG = os.getenv("RELEASE_TAG")
VERSION_FILE = "src/version.txt"
@@ -52,6 +53,7 @@ def test_output(dockerc, main_container):
# make sure container exited if running test isolated
dockerc.wait(main_container.id)
log_output = main_container.logs()
assert DIVISION_MESSAGE in log_output, "Division message not found in log output."
assert SECRET_QUOTE in log_output, "Secret not found in log output."