Skip to content
Merged
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
7 changes: 7 additions & 0 deletions .ddev/web-build/Dockerfile.inotify
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ENV extension=inotify
SHELL ["/bin/bash", "-c"]
# Install the needed development packages
RUN (apt-get update || true) && DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::="--force-confnew" --no-install-recommends --no-install-suggests build-essential php-pear php${DDEV_PHP_VERSION}-dev
RUN pecl install ${extension}
RUN echo "extension=${extension}.so" > /etc/php/${DDEV_PHP_VERSION}/mods-available/${extension}.ini && chmod 666 /etc/php/${DDEV_PHP_VERSION}/mods-available/${extension}.ini
RUN phpenmod ${extension}
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
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Usage with Docker (via custom container)

Build the custom local Docker container::

docker build --file Dockerfile --tag typo3-docs:local .
make docker-build


Execute the Docker container that is provided locally, build Documentation
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"ext-libxml": "*",
"brotkrueml/twig-codehighlight": "^1.0",
"league/flysystem": "^1.1.10",
"phpdocumentor/dev-server": "^1.9",
"phpdocumentor/filesystem": "^1.9",
"phpdocumentor/guides": "^1.9",
"phpdocumentor/guides-cli": "^1.9",
Expand All @@ -17,9 +18,11 @@
"phpdocumentor/guides-restructured-text": "^1.9",
"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",
"symfony/polyfill-php84": "^1.33",
"symfony/yaml": "^6.4",
"t3docs/console-command": "^0.2.0",
"t3docs/guides-php-domain": "^1.0",
Expand Down
Loading