mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-09 16:24:51 +00:00
update proxy-acme paths
This commit is contained in:
parent
44266b950b
commit
45f1df78b0
3 changed files with 13 additions and 8 deletions
|
@ -97,17 +97,17 @@ RUN set -ex \
|
||||||
|
|
||||||
FROM php:${PHP_VERSION}-${PHP_BASE_TYPE}-${PHP_DEBIAN_RELEASE} AS base
|
FROM php:${PHP_VERSION}-${PHP_BASE_TYPE}-${PHP_DEBIAN_RELEASE} AS base
|
||||||
|
|
||||||
ARG APT_PACKAGES_EXTRA
|
|
||||||
ARG BUILDKIT_SBOM_SCAN_STAGE="true"
|
ARG BUILDKIT_SBOM_SCAN_STAGE="true"
|
||||||
|
|
||||||
|
ARG APT_PACKAGES_EXTRA
|
||||||
|
ARG DOTENV_LINTER_VERSION
|
||||||
ARG PHP_DEBIAN_RELEASE
|
ARG PHP_DEBIAN_RELEASE
|
||||||
ARG PHP_VERSION
|
ARG PHP_VERSION
|
||||||
ARG RUNTIME_GID
|
ARG RUNTIME_GID
|
||||||
ARG RUNTIME_UID
|
ARG RUNTIME_UID
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
ARG DOTENV_LINTER_VERSION
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND="noninteractive"
|
ENV DEBIAN_FRONTEND="noninteractive"
|
||||||
ENV DOTENV_LINTER_VERSION="${DOTENV_LINTER_VERSION}"
|
|
||||||
|
|
||||||
# Ensure we run all scripts through 'bash' rather than 'sh'
|
# Ensure we run all scripts through 'bash' rather than 'sh'
|
||||||
SHELL ["/bin/bash", "-c"]
|
SHELL ["/bin/bash", "-c"]
|
||||||
|
@ -119,6 +119,7 @@ RUN set -ex \
|
||||||
WORKDIR /var/www/
|
WORKDIR /var/www/
|
||||||
|
|
||||||
ENV APT_PACKAGES_EXTRA=${APT_PACKAGES_EXTRA}
|
ENV APT_PACKAGES_EXTRA=${APT_PACKAGES_EXTRA}
|
||||||
|
ENV DOTENV_LINTER_VERSION="${DOTENV_LINTER_VERSION}"
|
||||||
|
|
||||||
# Install and configure base layer
|
# Install and configure base layer
|
||||||
COPY docker/shared/root/docker/install/base.sh /docker/install/base.sh
|
COPY docker/shared/root/docker/install/base.sh /docker/install/base.sh
|
||||||
|
@ -148,7 +149,7 @@ ENV PHP_PECL_EXTENSIONS_EXTRA=${PHP_PECL_EXTENSIONS_EXTRA}
|
||||||
ENV PHP_PECL_EXTENSIONS=${PHP_PECL_EXTENSIONS}
|
ENV PHP_PECL_EXTENSIONS=${PHP_PECL_EXTENSIONS}
|
||||||
|
|
||||||
COPY docker/shared/root/docker/install/php-extensions.sh /docker/install/php-extensions.sh
|
COPY docker/shared/root/docker/install/php-extensions.sh /docker/install/php-extensions.sh
|
||||||
RUN --mount=type=cache,id=pixelfed-php-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/usr/src/php/ \
|
RUN --mount=type=cache,id=pixelfed-php-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/usr/src/php \
|
||||||
--mount=type=cache,id=pixelfed-apt-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/lib/apt \
|
--mount=type=cache,id=pixelfed-apt-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/lib/apt \
|
||||||
--mount=type=cache,id=pixelfed-apt-cache-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/cache/apt \
|
--mount=type=cache,id=pixelfed-apt-cache-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/cache/apt \
|
||||||
/docker/install/php-extensions.sh
|
/docker/install/php-extensions.sh
|
||||||
|
|
|
@ -53,12 +53,12 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- proxy
|
- proxy
|
||||||
volumes:
|
volumes:
|
||||||
- "${DOCKER_HOST_SOCKET_PATH}:/var/run/docker.sock:ro"
|
- "${DOCKER_CONFIG_ROOT}/proxy-acme:/etc/acme.sh"
|
||||||
|
- "${DOCKER_CONFIG_ROOT}/proxy/certs:/etc/nginx/certs"
|
||||||
- "${DOCKER_CONFIG_ROOT}/proxy/conf.d:/etc/nginx/conf.d"
|
- "${DOCKER_CONFIG_ROOT}/proxy/conf.d:/etc/nginx/conf.d"
|
||||||
- "${DOCKER_CONFIG_ROOT}/proxy/vhost.d:/etc/nginx/vhost.d"
|
- "${DOCKER_CONFIG_ROOT}/proxy/vhost.d:/etc/nginx/vhost.d"
|
||||||
- "${DOCKER_CONFIG_ROOT}/proxy/certs:/etc/nginx/certs"
|
|
||||||
- "${DOCKER_DATA_ROOT}/proxy/html:/usr/share/nginx/html"
|
- "${DOCKER_DATA_ROOT}/proxy/html:/usr/share/nginx/html"
|
||||||
- "${DOCKER_DATA_ROOT}/proxy-acme:/etc/acme.sh"
|
- "${DOCKER_HOST_SOCKET_PATH}:/var/run/docker.sock:ro"
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: "${DOCKER_IMAGE}:${DOCKER_TAG}"
|
image: "${DOCKER_IMAGE}:${DOCKER_TAG}"
|
||||||
|
@ -131,7 +131,7 @@ services:
|
||||||
image: redis:7.2
|
image: redis:7.2
|
||||||
container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-redis"
|
container_name: "${DOCKER_CONTAINER_NAME_PREFIX}-redis"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: "${DOCKER_REDIS_CONFIG_FILE} --requirepass '${REDIS_PASSWORD:-}'"
|
command: "${DOCKER_REDIS_CONFIG_FILE:-} --requirepass '${REDIS_PASSWORD:-}'"
|
||||||
environment:
|
environment:
|
||||||
- REDISCLI_AUTH=${REDIS_PASSWORD:-}
|
- REDISCLI_AUTH=${REDIS_PASSWORD:-}
|
||||||
env_file:
|
env_file:
|
||||||
|
|
|
@ -19,6 +19,10 @@ fi
|
||||||
load-config-files
|
load-config-files
|
||||||
await-database-ready
|
await-database-ready
|
||||||
|
|
||||||
|
# Following https://docs.pixelfed.org/running-pixelfed/installation/#one-time-setup-tasks
|
||||||
|
#
|
||||||
|
# NOTE: Caches happens in [30-cache.sh]
|
||||||
|
|
||||||
only-once "key:generate" run-as-runtime-user php artisan key:generate
|
only-once "key:generate" run-as-runtime-user php artisan key:generate
|
||||||
only-once "storage:link" run-as-runtime-user php artisan storage:link
|
only-once "storage:link" run-as-runtime-user php artisan storage:link
|
||||||
only-once "initial:migrate" run-as-runtime-user php artisan migrate --force
|
only-once "initial:migrate" run-as-runtime-user php artisan migrate --force
|
||||||
|
|
Loading…
Reference in a new issue