Skip to content

Commit 05ec7f0

Browse files
Update Makefile to check all Dockerfiles (RonaldHensbergen#119)
* Update Makefile to check all Dockerfiles * Update Dockerfile search pattern in CI workflow * Fix/dagster round 2 (RonaldHensbergen#121) (RonaldHensbergen#122) * Fixing Dagster user-code being unhealthy * Test-case T1 succeeds! * Updating the test checklist * Updated test with correct Dockerfile * Linting issues (why a file I didn't change?) * Updating Dockerfile * Adding healthcheck to docker-daemon image * Added test for dagster daemon running when dagster is part of the profile * Fix/dagster round 2 (RonaldHensbergen#117) (RonaldHensbergen#120) * Fixing Dagster user-code being unhealthy * Test-case T1 succeeds! * Updating the test checklist * Updated test with correct Dockerfile * Linting issues (why a file I didn't change?) * user-code image build check is good again
1 parent 4e09e87 commit 05ec7f0

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,12 @@ jobs:
7373

7474
- name: Build all Dockerfiles
7575
run: |
76-
for dockerfile in $(find . -name "Dockerfile" -type f); do
76+
for dockerfile in $(find . -name "Dockerfile*" -type f); do
7777
dir=$(dirname "$dockerfile")
7878
echo "Building $dockerfile in directory $dir..."
79-
docker build -f "$dockerfile" "$dir" || exit 1
79+
context="$dir"
80+
if [ "$dockerfile" = "./images/dagster/Dockerfile.user-code" ]; then
81+
context="."
82+
fi
83+
docker build -f "$dockerfile" "$context" || exit 1
8084
done

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@ package:
2929

3030
docker-build:
3131
@echo "Building all Dockerfiles..."
32-
@for dockerfile in $$(find . -name "Dockerfile" -type f); do \
32+
@for dockerfile in $$(find . -name "Dockerfile*" -type f); do \
3333
dir=$$(dirname "$$dockerfile"); \
3434
echo "Building $$dockerfile in directory $$dir..."; \
35-
docker build -f "$$dockerfile" "$$dir" || exit 1; \
35+
context="$$dir"; \
36+
if [ "$$dockerfile" = "./images/dagster/Dockerfile.user-code" ]; then \
37+
context="."; \
38+
fi; \
39+
docker build -f "$$dockerfile" "$$context" || exit 1; \
3640
done
3741
@echo "All Dockerfiles built successfully!"

0 commit comments

Comments
 (0)