Skip to content

Commit 440ffe2

Browse files
committed
chore(docker): serve interactively in a container
1 parent dfff52d commit 440ffe2

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

Dockerfile

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

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

Makefile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,27 @@ BUILDDIR = _build
66
MKDOCS = mkdocs
77
MKDOCSBUILDOPTS = --clean --strict --verbose
88
MKDOCSBUILD = $(MKDOCS) build $(MKDOCSBUILDOPTS)
9+
MKDOCSSERVE = $(MKDOCS) serve -a 0.0.0.0:8000
10+
11+
SHORT_NAME ?= docs-v2
12+
VERSION ?= git-$(shell git rev-parse --short HEAD)
13+
IMAGE := ${SHORT_NAME}:${VERSION}
14+
15+
REPO_PATH := github.com/deis/${SHORT_NAME}
16+
DEV_ENV_WORK_DIR := /src/${REPO_PATH}
17+
DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} -p 8000:8000
18+
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
919

1020
build:
1121
$(MKDOCSBUILD) --site-dir $(BUILDDIR)/html
1222
@echo
1323
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
1424

25+
serve:
26+
$(MKDOCSSERVE)
27+
@echo
28+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
29+
1530
clean:
1631
rm -rf $(BUILDDIR)/*
1732

@@ -22,3 +37,9 @@ test: build
2237
grep -q '<h1 id="welcome">Welcome</h1>' _build/html/index.html
2338
@echo
2439
@echo "Test finished. The HTML pages are in $(BUILDDIR)/html."
40+
41+
docker-build:
42+
docker build --rm -t ${IMAGE} .
43+
44+
docker-serve:
45+
${DEV_ENV_CMD} ${IMAGE}

0 commit comments

Comments
 (0)