Skip to content

Commit 2b11d1b

Browse files
author
Vaughn Dice
committed
feat(Makefile/Dockerfile): add docker-test recipe
1 parent b367c43 commit 2b11d1b

2 files changed

Lines changed: 17 additions & 8 deletions

File tree

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ WORKDIR /app
66
RUN pip install -r requirements.txt
77

88
EXPOSE 8000
9-
ENTRYPOINT ["mkdocs", "serve", "-a", "0.0.0.0:8000"]

Makefile

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@ DEV_ENV_WORK_DIR := /src/${REPO_PATH}
1717
DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} -p 8000:8000
1818
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
1919

20+
BUILD_CMD := $(MKDOCSBUILD) --site-dir $(BUILDDIR) && \
21+
echo && \
22+
echo "Build finished. The HTML pages are in $(BUILDDIR)."
23+
24+
TEST_CMD := grep -q "<title>Deis Workflow Documentation</title>" _build/html/index.html && \
25+
echo && \
26+
echo "Test finished. The HTML pages are in $(BUILDDIR)."
27+
2028
build:
21-
$(MKDOCSBUILD) --site-dir $(BUILDDIR)
22-
@echo
23-
@echo "Build finished. The HTML pages are in $(BUILDDIR)."
29+
$(BUILD_CMD)
2430

2531
serve:
2632
$(MKDOCSSERVE)
@@ -32,12 +38,16 @@ deps:
3238
pip install -r requirements.txt
3339

3440
test: build
35-
grep -q '<title>Deis Workflow Documentation</title>' _build/html/index.html
36-
@echo
37-
@echo "Test finished. The HTML pages are in $(BUILDDIR)."
41+
$(TEST_CMD)
42+
43+
docker-build-docs:
44+
$(DEV_ENV_CMD) ${IMAGE} $(BUILD_CMD)
45+
46+
docker-test: docker-build-docs
47+
${DEV_ENV_CMD} ${IMAGE} $(TEST_CMD)
3848

3949
docker-build:
4050
docker build --rm -t ${IMAGE} .
4151

4252
docker-serve:
43-
${DEV_ENV_CMD} ${IMAGE}
53+
${DEV_ENV_CMD} ${IMAGE} $(MKDOCSSERVE)

0 commit comments

Comments
 (0)