From 519704cbe84907d3a349eb068f413eb829ef146e Mon Sep 17 00:00:00 2001 From: Christian Winther Date: Mon, 15 Jan 2024 14:57:40 +0000 Subject: [PATCH] more tuning --- .env.docker | 34 ++++++++++++++++++++-------------- .github/workflows/docker.yml | 3 ++- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.env.docker b/.env.docker index 00bdb4570..559c06553 100644 --- a/.env.docker +++ b/.env.docker @@ -19,22 +19,30 @@ DOCKER_CONFIG_ROOT="./docker-compose/config" # DOCKER_IMAGE="ghcr.io/jippi/pixelfed" -# Pixelfed version (image tag) to pull from the registry +# Pixelfed version (image tag) to pull from the registry. +# +# See: https://github.com/pixelfed/pixelfed/pkgs/container/pixelfed DOCKER_TAG="branch-jippi-fork-apache-8.1" -# Set timezone used by *all* containers - these should be in sync +# Set timezone used by *all* containers - these should be in sync. # # See: https://www.php.net/manual/en/timezones.php TZ="UTC" -# Automatically run [artisan migrate --force] if new migrations are detected +# Automatically run [artisan migrate --force] if new migrations are detected. DOCKER_APPLY_NEW_MIGRATIONS_AUTOMATICALLY="0" -# The e-mail to use for Lets Encrypt certificate requests +# The e-mail to use for Lets Encrypt certificate requests. LETSENCRYPT_EMAIL="__CHANGE_ME__" -# Lets Encrypt staging/test servers for certificate requests -LETSENCRYPT_TEST= +# Lets Encrypt staging/test servers for certificate requests. +# +# Setting this to any value will change to letsencrypt test servers. +#LETSENCRYPT_TEST="1" + +# Enable Docker Entrypoint debug mode (will call [set -x] in bash scripts) +# by setting this to "1". +#ENTRYPOINT_DEBUG="0" ############################################################### # Pixelfed application configuration @@ -42,13 +50,13 @@ LETSENCRYPT_TEST= # A random 32-character string to be used as an encryption key. # -# No default value; use [php artisan key:generate] to generate. +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# ! NOTE: This will be auto-generated by Docker during bootstrap +# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # # This key is used by the Illuminate encrypter service and should be set to a random, # 32 character string, otherwise these encrypted strings will not be safe. # -# Please do this before deploying an application! -# # See: https://docs.pixelfed.org/technical-documentation/config/#app_key APP_KEY= @@ -102,7 +110,7 @@ ADMIN_DOMAIN="${APP_DOMAIN}" # Defaults to "1000". # # See: https://docs.pixelfed.org/technical-documentation/config/#pf_max_users -PF_MAX_USERS="1000" +#PF_MAX_USERS="1000" # Enforce the maximum number of user accounts # @@ -152,7 +160,7 @@ APP_TIMEZONE="${TZ}" # Defaults to "15000" (15MB). # # See: https://docs.pixelfed.org/technical-documentation/config/#max_photo_size-kb -MAX_PHOTO_SIZE="15000" +#MAX_PHOTO_SIZE="15000" # Update the max avatar size, in kB. # @@ -187,7 +195,7 @@ MAX_PHOTO_SIZE="15000" # Defaults to "4". # # See: https://docs.pixelfed.org/technical-documentation/config/#max_album_length -MAX_ALBUM_LENGTH="4" +#MAX_ALBUM_LENGTH="4" # Resize and optimize image uploads. # @@ -296,8 +304,6 @@ DB_DATABASE="pixelfed_prod" # See: https://docs.pixelfed.org/technical-documentation/config/#db_port DB_PORT="3306" -ENTRYPOINT_DEBUG=0 - ############################################################### # Mail configuration ############################################################### diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d08ab8e73..a2e73a61a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -147,7 +147,8 @@ jobs: latest=auto suffix=-${{ matrix.target_runtime }}-${{ matrix.php_version }} tags: | - type=edge,branch=dev + type=raw,value=dev,enable=${{ github.ref == format('refs/heads/{0}', 'dev') }} + type=raw,value=staging,enable=${{ github.ref == format('refs/heads/{0}', 'staging') }} type=pep440,pattern={{raw}} type=pep440,pattern=v{{major}}.{{minor}} type=ref,event=branch,prefix=branch-