@@ -9,32 +9,13 @@ LABEL org.opencontainers.image.authors="99linesofcode@gmail.com"
99
1010ARG VERSION
1111
12- RUN apk add --no-cache \
13- php${VERSION/./}-bcmath \
14- php${VERSION/./}-ctype \
15- php${VERSION/./}-curl \
16- php${VERSION/./}-dom \
17- php${VERSION/./}-fileinfo \
18- php${VERSION/./}-fpm \
19- php${VERSION/./}-iconv \
20- php${VERSION/./}-intl \
21- php${VERSION/./}-json \
22- php${VERSION/./}-mbstring \
23- php${VERSION/./}-opcache \
24- php${VERSION/./}-openssl \
25- php${VERSION/./}-pcntl \
26- php${VERSION/./}-phar \
27- php${VERSION/./}-pdo_mysql \
28- php${VERSION/./}-pdo_pgsql \
29- php${VERSION/./}-pdo_sqlite \
30- php${VERSION/./}-session \
31- php${VERSION/./}-simplexml \
32- php${VERSION/./}-tokenizer \
33- php${VERSION/./}-xml \
34- php${VERSION/./}-xmlwriter \
35- php${VERSION/./}-zlib \
36- php${VERSION/./}-zip \
37- php${VERSION/./}-pecl-redis;
12+ RUN install-php-extensions \
13+ bcmath \
14+ intl \
15+ pcntl \
16+ pdo_pgsql \
17+ zip \
18+ redis;
3819
3920WORKDIR /app
4021
@@ -44,45 +25,45 @@ WORKDIR /app
4425
4526FROM base AS development
4627
47- RUN apk add --no-cache \
48- composer \
49- php${VERSION/./}-pecl- xdebug;
28+ RUN install-php-extensions \
29+ @ composer \
30+ xdebug;
5031
5132COPY --link ./frankenphp/php.ini-development ${PHP_INI_DIR}/php.ini
5233
5334#
5435# Production
5536#
5637
57- FROM dunglas/frankenphp:builder AS caddy-builder
58-
59- COPY --from=caddy:builder /usr/bin/xcaddy /usr/bin/xcaddy
60-
61- # CGO must be enabled to build FrankenPHP
62- RUN CGO_ENABLED=1 \
63- XCADDY_SETCAP=1 \
64- XCADDY_GO_BUILD_FLAGS="-ldflags='-w -s' -tags=nobadger,nomysql,nopgx" \
65- CGO_CFLAGS=$(php-config --includes) \
66- CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
67- xcaddy build \
68- --output /usr/local/bin/frankenphp \
69- --with github.com/dunglas/frankenphp=./ \
70- --with github.com/dunglas/frankenphp/caddy=./caddy/ \
71- --with github.com/caddy-dns/cloudflare;
72-
38+ # FROM dunglas/frankenphp:builder AS caddy-builder
39+ #
40+ # COPY --from=caddy:builder /usr/bin/xcaddy /usr/bin/xcaddy
41+ #
42+ # # CGO must be enabled to build FrankenPHP
43+ # RUN CGO_ENABLED=1 \
44+ # XCADDY_SETCAP=1 \
45+ # XCADDY_GO_BUILD_FLAGS="-ldflags='-w -s' -tags=nobadger,nomysql,nopgx" \
46+ # CGO_CFLAGS=$(php-config --includes) \
47+ # CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
48+ # xcaddy build \
49+ # --output /usr/local/bin/frankenphp \
50+ # --with github.com/dunglas/frankenphp=./ \
51+ # --with github.com/dunglas/frankenphp/caddy=./caddy/ \
52+ # --with github.com/caddy-dns/cloudflare;
53+ #
7354FROM base AS composer-builder
7455
75- RUN apk add --no-cache \
76- composer && \
56+ RUN install-php-extensions \
57+ @ composer && \
7758 composer install -n --no-cache --prefer-dist --no-dev --no-scripts -o -a;
7859
7960FROM base AS production
8061
8162RUN mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini;
8263
8364# Replace the official binary by the one containing our custom modules
84- COPY --from=caddy-builder /usr/local/bin/frankenphp /usr/local/bin/frankenphp
65+ # COPY --from=caddy-builder /usr/local/bin/frankenphp /usr/local/bin/frankenphp
8566COPY --link ./docker/frankenphp/Caddyfile /etc/caddy/Caddyfile
86- COPY --link --chmod=755 ./docker/frankenphp/docker-php-entrypoint.sh /usr/local/bin/docker-php-entrypoint>
67+ # COPY --link --chmod=755 ./docker/frankenphp/docker-php-entrypoint.sh /usr/local/bin/docker-php-entrypoint
8768
8869COPY . ./
0 commit comments