fix: docker support

This commit is contained in:
Maël Gangloff 2024-08-11 20:24:04 +02:00
parent 83aa283b3d
commit 2def3bbc8e
No known key found for this signature in database
GPG Key ID: 11FDC81C24A7F629
2 changed files with 34 additions and 28 deletions

View File

@ -7,7 +7,6 @@ FROM dunglas/frankenphp:1-php8.3 AS frankenphp_upstream
# https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage # https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
# https://docs.docker.com/compose/compose-file/#target # https://docs.docker.com/compose/compose-file/#target
# Base FrankenPHP image # Base FrankenPHP image
FROM frankenphp_upstream AS frankenphp_base FROM frankenphp_upstream AS frankenphp_base
@ -30,12 +29,15 @@ RUN set -eux; \
apcu \ apcu \
intl \ intl \
opcache \ opcache \
zip \ zip
;
RUN set -eux; \
curl -fsSL https://deb.nodesource.com/setup_22.x | bash -; \
apt-get install -y nodejs; \
npm install -g yarn
# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
ENV COMPOSER_ALLOW_SUPERUSER=1 ENV COMPOSER_ALLOW_SUPERUSER=1
ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d" ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
###> recipes ### ###> recipes ###
@ -49,7 +51,6 @@ COPY --link --chmod=755 frankenphp/docker-entrypoint.sh /usr/local/bin/docker-en
COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
ENTRYPOINT ["docker-entrypoint"] ENTRYPOINT ["docker-entrypoint"]
HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1 HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ] CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
@ -62,8 +63,7 @@ RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
RUN set -eux; \ RUN set -eux; \
install-php-extensions \ install-php-extensions \
xdebug \ xdebug
;
COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/ COPY --link frankenphp/conf.d/20-app.dev.ini $PHP_INI_DIR/app.conf.d/
@ -94,4 +94,10 @@ RUN set -eux; \
composer dump-autoload --classmap-authoritative --no-dev; \ composer dump-autoload --classmap-authoritative --no-dev; \
composer dump-env prod; \ composer dump-env prod; \
composer run-script --no-dev post-install-cmd; \ composer run-script --no-dev post-install-cmd; \
chmod +x bin/console; sync; \ chmod +x bin/console; \
sync
RUN php bin/console assets:install
RUN yarn install
RUN yarn run build
RUN yarn run ttag:po2json

View File

@ -12,7 +12,7 @@
<meta property="og:type" content="website"/> <meta property="og:type" content="website"/>
<meta property="og:title" content="Domain Watchdog"/> <meta property="og:title" content="Domain Watchdog"/>
<meta property="og:image" content="{{ asset('images/banner.png') }}"> <meta property="og:image" content="/images/banner.png">
<meta property="og:description" <meta property="og:description"
content="A standalone app that collects open access information about domain names, helping users track the history and changes associated with domain names"/> content="A standalone app that collects open access information about domain names, helping users track the history and changes associated with domain names"/>
<meta property="og:site_name" content="Domain Watchdog"/> <meta property="og:site_name" content="Domain Watchdog"/>
@ -21,11 +21,11 @@
<meta property="twitter:title" content="Domain Watchdog"/> <meta property="twitter:title" content="Domain Watchdog"/>
<meta property="twitter:description" <meta property="twitter:description"
content="A standalone app that collects open access information about domain names, helping users track the history and changes associated with domain names"/> content="A standalone app that collects open access information about domain names, helping users track the history and changes associated with domain names"/>
<meta property="twitter:image" content="{{ asset('images/banner.png') }}"/> <meta property="twitter:image" content="/images/banner.png"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="manifest" href="{{ asset('manifest.json') }}"/> <link rel="manifest" href="/manifest.json"/>
<title>Domain Watchdog</title> <title>Domain Watchdog</title>
{{ encore_entry_link_tags('app') }} {{ encore_entry_link_tags('app') }}
</head> </head>