Skip to content

PR that could fix issue #152 #153

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.

Sign up for GitHub

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

Merged
BretFisher merged 3 commits into from
Mar 23, 2025
Merged

PR that could fix issue #152 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bea3ec7
Fix typo
CSpyridakis Mar 21, 2025
910860d
Remove code from assignments, as it already exists in the answer dire…
CSpyridakis Mar 21, 2025
6a2914a
Revert swarm-secrets-assignment-1/docker-compose.yml, for which accid…
CSpyridakis Mar 21, 2025
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
2 changes: 1 addition & 1 deletion dockerfiles/entrypoint/assignment01/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> Creating CLI programs with Docker ENTRYPOINT

This assignment has two different Dockerfiles for you to build that are meant to run a single execuable.
This assignment has two different Dockerfiles for you to build that are meant to run a single executable.

1. The cmatrix subdirectory uses the Alpine Linux image and installs the cmatrix screen saver.
2. The apachebench subdirectory uses the Ubuntu image and installs the apache2-utils package for running the ab benchmarking tool.
Expand Down
8 changes: 0 additions & 8 deletions dockerfiles/entrypoint/assignment01/apachebench/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
# use the README.md file for requirements to build this image
# If you get stuck, the answer/ directory has the solution
FROM ubuntu:latest

RUN apt-get update && \
apt-get install -y apache2-utils && \
rm -rf /var/lib/apt/lists/*

ENTRYPOINT ["ab"]

CMD ["-n", "10", "-c", "2", "https://www.bretfisher.com/"]

6 changes: 0 additions & 6 deletions dockerfiles/entrypoint/assignment01/cmatrix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
# use the README.md file for requirements to build this image
# If you get stuck, the answer/ directory has the solution
FROM alpine:latest

RUN apk add --no-cache cmatrix

ENTRYPOINT ["cmatrix"]

CMD ["-abs", "-C", "red"]

14 changes: 0 additions & 14 deletions dockerfiles/entrypoint/assignment02/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
# use the README.md file for requirements to build this image
# If you get stuck, the answer/ directory has the solution
FROM python:slim

WORKDIR /app

COPY requirements.txt .

RUN pip install --no-cache-dir -r requirements.txt

COPY . .

VOLUME /app/data

ENTRYPOINT ["./docker-entrypoint.sh"]

CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]