@@ -24,7 +24,7 @@ RUN chmod +x /usr/local/bin/docker-entrypoint
24
24
ENTRYPOINT ["docker-entrypoint" ]
25
25
CMD ["npm" , "run" , "watch" ]
26
26
27
- FROM php:8.2-fpm-bookworm AS app
27
+ FROM ghcr.io/noagenda/website/app:base AS app
28
28
29
29
ARG UID=3302
30
30
ARG GID=3302
@@ -40,44 +40,44 @@ RUN rm -rf /srv/app
40
40
RUN mkdir -p /srv/app; chown $UID:$GID /srv/app
41
41
WORKDIR /srv/app
42
42
43
- # Configure app user
44
- RUN groupdel dialout; \
45
- groupadd --gid $GID ben; \
46
- useradd --uid $UID --gid $GID --create-home ben; \
47
- sed -i "s/user = www-data/user = ben/g" /usr/local/etc/php-fpm.d/www.conf; \
48
- sed -i "s/group = www-data/group = ben/g" /usr/local/etc/php-fpm.d/www.conf
49
-
50
- # Install persistent & runtime dependencies
51
- RUN set -eux; \
52
- apt-get update; \
53
- apt-get install --no-install-recommends -y git netcat-traditional procps; \
54
- rm -rf /var/lib/apt/lists/*
55
-
56
- # Install PHP extensions
57
- RUN set -eux; \
58
- apt-get update; \
59
- apt-get install --no-install-recommends -y libmagickwand-dev; \
60
- pecl install imagick; \
61
- docker-php-ext-enable imagick; \
62
- rm -rf /var/lib/apt/lists/*
63
-
64
- RUN set -eux; \
65
- apt-get update; \
66
- apt-get install --no-install-recommends -y libicu-dev; \
67
- docker-php-ext-install intl; \
68
- rm -rf /var/lib/apt/lists/*
69
-
70
- RUN set -eux; \
71
- docker-php-ext-install pdo_mysql
72
-
73
- RUN set -eux; \
74
- apt-get update; \
75
- apt-get install --no-install-recommends -y libzip-dev unzip; \
76
- docker-php-ext-install zip; \
77
- rm -rf /var/lib/apt/lists/*
78
-
79
- # Install Composer
80
- COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
43
+ # # Configure app user
44
+ # RUN groupdel dialout; \
45
+ # groupadd --gid $GID ben; \
46
+ # useradd --uid $UID --gid $GID --create-home ben; \
47
+ # sed -i "s/user = www-data/user = ben/g" /usr/local/etc/php-fpm.d/www.conf; \
48
+ # sed -i "s/group = www-data/group = ben/g" /usr/local/etc/php-fpm.d/www.conf
49
+ #
50
+ # # Install persistent & runtime dependencies
51
+ # RUN set -eux; \
52
+ # apt-get update; \
53
+ # apt-get install --no-install-recommends -y git netcat-traditional procps; \
54
+ # rm -rf /var/lib/apt/lists/*
55
+ #
56
+ # # Install PHP extensions
57
+ # RUN set -eux; \
58
+ # apt-get update; \
59
+ # apt-get install --no-install-recommends -y libmagickwand-dev; \
60
+ # pecl install imagick; \
61
+ # docker-php-ext-enable imagick; \
62
+ # rm -rf /var/lib/apt/lists/*
63
+ #
64
+ # RUN set -eux; \
65
+ # apt-get update; \
66
+ # apt-get install --no-install-recommends -y libicu-dev; \
67
+ # docker-php-ext-install intl; \
68
+ # rm -rf /var/lib/apt/lists/*
69
+ #
70
+ # RUN set -eux; \
71
+ # docker-php-ext-install pdo_mysql
72
+ #
73
+ # RUN set -eux; \
74
+ # apt-get update; \
75
+ # apt-get install --no-install-recommends -y libzip-dev unzip; \
76
+ # docker-php-ext-install zip; \
77
+ # rm -rf /var/lib/apt/lists/*
78
+ #
79
+ # # Install Composer
80
+ # COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
81
81
82
82
RUN if [ ! -z "$GITHUB_TOKEN" ]; then composer config --global github-oauth.github.com $GITHUB_TOKEN; fi
83
83
0 commit comments