diff --git a/Dockerfile b/Dockerfile index 2adbc61..14647a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN chmod +x /usr/local/bin/docker-entrypoint ENTRYPOINT ["docker-entrypoint"] CMD ["npm", "run", "watch"] -FROM php:8.2-fpm-bookworm AS app +FROM ghcr.io/noagenda/website/app:base AS app ARG UID=3302 ARG GID=3302 @@ -40,44 +40,44 @@ RUN rm -rf /srv/app RUN mkdir -p /srv/app; chown $UID:$GID /srv/app WORKDIR /srv/app -# Configure app user -RUN groupdel dialout; \ - groupadd --gid $GID ben; \ - useradd --uid $UID --gid $GID --create-home ben; \ - sed -i "s/user = www-data/user = ben/g" /usr/local/etc/php-fpm.d/www.conf; \ - sed -i "s/group = www-data/group = ben/g" /usr/local/etc/php-fpm.d/www.conf - -# Install persistent & runtime dependencies -RUN set -eux; \ - apt-get update; \ - apt-get install --no-install-recommends -y git netcat-traditional procps; \ - rm -rf /var/lib/apt/lists/* - -# Install PHP extensions -RUN set -eux; \ - apt-get update; \ - apt-get install --no-install-recommends -y libmagickwand-dev; \ - pecl install imagick; \ - docker-php-ext-enable imagick; \ - rm -rf /var/lib/apt/lists/* - -RUN set -eux; \ - apt-get update; \ - apt-get install --no-install-recommends -y libicu-dev; \ - docker-php-ext-install intl; \ - rm -rf /var/lib/apt/lists/* - -RUN set -eux; \ - docker-php-ext-install pdo_mysql - -RUN set -eux; \ - apt-get update; \ - apt-get install --no-install-recommends -y libzip-dev unzip; \ - docker-php-ext-install zip; \ - rm -rf /var/lib/apt/lists/* - -# Install Composer -COPY --from=composer:2 /usr/bin/composer /usr/bin/composer +## Configure app user +#RUN groupdel dialout; \ +# groupadd --gid $GID ben; \ +# useradd --uid $UID --gid $GID --create-home ben; \ +# sed -i "s/user = www-data/user = ben/g" /usr/local/etc/php-fpm.d/www.conf; \ +# sed -i "s/group = www-data/group = ben/g" /usr/local/etc/php-fpm.d/www.conf +# +## Install persistent & runtime dependencies +#RUN set -eux; \ +# apt-get update; \ +# apt-get install --no-install-recommends -y git netcat-traditional procps; \ +# rm -rf /var/lib/apt/lists/* +# +## Install PHP extensions +#RUN set -eux; \ +# apt-get update; \ +# apt-get install --no-install-recommends -y libmagickwand-dev; \ +# pecl install imagick; \ +# docker-php-ext-enable imagick; \ +# rm -rf /var/lib/apt/lists/* +# +#RUN set -eux; \ +# apt-get update; \ +# apt-get install --no-install-recommends -y libicu-dev; \ +# docker-php-ext-install intl; \ +# rm -rf /var/lib/apt/lists/* +# +#RUN set -eux; \ +# docker-php-ext-install pdo_mysql +# +#RUN set -eux; \ +# apt-get update; \ +# apt-get install --no-install-recommends -y libzip-dev unzip; \ +# docker-php-ext-install zip; \ +# rm -rf /var/lib/apt/lists/* +# +## Install Composer +#COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN if [ ! -z "$GITHUB_TOKEN" ]; then composer config --global github-oauth.github.com $GITHUB_TOKEN; fi diff --git a/readme.markdown b/readme.markdown index 2453b5e..d17f1b2 100644 --- a/readme.markdown +++ b/readme.markdown @@ -16,7 +16,7 @@ wich requires to be run separately from the main application. ## Installation You need [Docker](https://www.docker.com/) to run this application. For more -information on managing the application, see the [Symfony 5.4 documentation](https://symfony.com/doc/5.4/index.html). +information on managing the application, see the [Symfony 6.4 documentation](https://symfony.com/doc/6.4/index.html). See `.env` for configuration options (create `.env.local` to override options).