Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ tools/
vendor/
Dockerfile
*.rst
build
.Build
Documentation*
.phpdoc
.cache
3 changes: 3 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
with:
coverage: "none"
php-version: "${{ matrix.php }}"
extensions: 'inotify, pcntl'

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
Expand All @@ -55,6 +56,7 @@ jobs:
with:
coverage: "none"
php-version: "${{ env.DEFAULT_PHP_VERSION }}"
extensions: 'inotify, pcntl'

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
Expand Down Expand Up @@ -91,6 +93,7 @@ jobs:
with:
coverage: "none"
php-version: "${{ env.DEFAULT_PHP_VERSION }}"
extensions: 'inotify, pcntl'

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
Expand Down
15 changes: 14 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
FROM composer:2 AS builder
FROM php:8.1-cli-alpine AS builder

COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer

RUN apk add --update $PHPIZE_DEPS
RUN pie install arnaud-lb/inotify && docker-php-ext-install pcntl

WORKDIR /opt/guides
COPY . /opt/guides
Expand All @@ -7,6 +13,13 @@ RUN composer install --no-dev --no-interaction --no-progress \
--no-suggest --optimize-autoloader --classmap-authoritative

FROM php:8.1-cli-alpine

COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
RUN apk add --update $PHPIZE_DEPS
RUN pie install arnaud-lb/inotify && docker-php-ext-install pcntl

RUN apk del $PHPIZE_DEPS && rm -rf /var/cache/apk/* /tmp/* /usr/share/php/* /usr/local/lib/php/doc/* /usr/local/lib/php/test/*

COPY . /opt/guides
WORKDIR /opt/guides

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PHP_BIN ?= docker run -i --rm --user $$(id -u):$$(id -g) -v${PWD}:/opt/project -

## Docker wrapper to use for a typo3-docs:local container.
## This container provides a runtime for the `guides` project
PHP_PROJECT_BIN ?= docker run -i --rm --user $$(id -u):$$(id -g) -v${PWD}:/project typo3-docs:local
PHP_PROJECT_BIN ?= docker run -i --rm --user $$(id -u):$$(id -g) -v${PWD}:/project --entrypoint=/project/vendor/bin/guides -p 1337:1337 typo3-docs:local

## Docker wrapper to use for a typo3-docs:local container.
## This container provides a composer-runtime; mounts project on /app
Expand Down Expand Up @@ -128,7 +128,7 @@ test: test-integration test-unit test-xml test-docs test-rendertest ## Runs all
.PHONY: test-docs
test-docs: ## Runs project generation tests
@echo "$(ENV_INFO)"
$(PHP_BIN) vendor/bin/guides --no-progress Documentation --output="/tmp/test" --config=Documentation --minimal-test
$(PHP_PROJECT_BIN) --no-progress Documentation --config=Documentation --minimal-test

.PHONY: test-rendertest
test-rendertest: ## Runs rendering with Documentation-rendertest
Expand Down
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@
"ext-libxml": "*",
"brotkrueml/twig-codehighlight": "^1.0",
"league/flysystem": "^1.1.10",
"phpdocumentor/filesystem": "^1.7",
"phpdocumentor/guides": "^1.7",
"phpdocumentor/guides-cli": "^1.8.1",
"phpdocumentor/dev-server": "1.x@dev",
"phpdocumentor/filesystem": "^1.9",
"phpdocumentor/guides": "^1.9",
"phpdocumentor/guides-cli": "1.x@dev",
"phpdocumentor/guides-graphs": "^1.0",
"phpdocumentor/guides-markdown": "^1.7",
"phpdocumentor/guides-restructured-text": "^1.7",
"phpdocumentor/guides-theme-bootstrap": "^1.7",
"phpdocumentor/guides-theme-rst": "^1.7",
"psr/http-message": "^1.1",
"symfony/clock": "^6.4",
"symfony/finder": "^6.4",
"symfony/http-client": "^6.4",
Expand Down
Loading
Loading