Skip to content

Commit

Permalink
refs #147: Access to Dockerized tools is now proxied by compose.
Browse files Browse the repository at this point in the history
  • Loading branch information
stickgrinder committed Mar 4, 2024
1 parent d0659be commit 6fae0ec
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 26 deletions.
33 changes: 12 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CURRENT_UID := $(shell id -u):$(shell id -g)

all: up
all: docs-up

docs-up:
docker compose pull
Expand All @@ -10,26 +10,17 @@ docs-down:
docker compose down

docs-deploy:
docker run --rm \
-v ".:/app" \
-u $(CURRENT_UID) \
-w /app \
minidocks/mkdocs gh-deploy --verbose

gdm-build:
docker build \
--no-cache \
--build-arg="DOCKER_USER_UID=$(shell id -u)" \
--build-arg="DOCKER_USER_GID=$(shell id -g)" \
-t popochiu-docs-maker:latest \
-f Dockerfile.DocsMaker .

gdm-generate:
docker run --rm \
-v .:/project \
-v ./docs-src/content/the-engine-handbook/scripting-reference:/output \
-u $(CURRENT_UID) \
popochiu-docs-maker:latest /project \
docker compose run \
--rm \
--user ${CURRENT_UID}
documentation \
mkdocs build --verbose

docs-extract:
docker compose run \
--rm \
--user $(CURRENT_UID) \
docs-generator /project \
-o /output \
-d addons/popochiu/engine/

Expand Down
11 changes: 10 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,13 @@ services:
build:
context: .
dockerfile: Dockerfile.MkDocs
command: serve -a 0.0.0.0:80
command: serve -a 0.0.0.0:80
docs-generator:
volumes:
- .:/project
- ./docs-src/content/the-engine-handbook/scripting-reference:/output
profiles:
- tools
build:
context: .
dockerfile: Dockerfile.DocsMaker

This file was deleted.

0 comments on commit 6fae0ec

Please sign in to comment.