Skip to content

Commit

Permalink
Merge branch 'master' into PHRAS-4010-mysql-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
nmaillat authored Jul 7, 2024
2 parents 743a6d4 + b0601b9 commit 4a3d05c
Show file tree
Hide file tree
Showing 116 changed files with 5,101 additions and 2,482 deletions.
22 changes: 11 additions & 11 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#
# - "docker-compose.limits.yml" : defines containers cpu and memory limits for all Phraseanet and gateway containers only.
#
# - "docker-compose.altenatives.yml": all alternative services, used only on evoluation or transition periods
# - "docker-compose.altenatives.yml": all alternative services, used only on evoluation or transition periods
#
# 2/ "COMPOSE_PROFILES" value define which profiles you want to use
# in docker-compose.
Expand All @@ -49,7 +49,7 @@
# choose to launch only some workers, see worker profile list below.
# - "worker" : launch one container worker with all jobs run on it.
# - "cmd" : launch a container based on worker image, useful for run cmd manualy.
# - "db" : db profile will launch a mariadb container,
# - "db" : db profile will launch a mariadb container,
# because this is the primary datastore, you should use you own SGDD service for production needs.
# - "elastisearch" : launch a elasticsearch container.
# - "rabbitmq" : launch a rabbitmq container.
Expand Down Expand Up @@ -143,7 +143,7 @@ PHRASEANET_DOCKER_REGISTRY=local

# Docker images tag.
# @run
PHRASEANET_DOCKER_TAG=4.1.8-rc9
PHRASEANET_DOCKER_TAG=4.1.8

# Stack Name
# An optionnal Name for the stack
Expand Down Expand Up @@ -485,7 +485,7 @@ PHRASEANET_CACHE_HOST=redis
# @run
PHRASEANET_CACHE_PORT=6379

# PHP session management
# PHP session management : this must be related to the SESSION_SAVE_HANDLER parameter. type can be redis, file or native
# @run
PHRASEANET_SESSION_TYPE=redis
# @run
Expand Down Expand Up @@ -908,25 +908,25 @@ PHRASEANET_SSH_PRIVATE_KEY=
# --- ImageMagick default policy override setting ----------------------------------------------------------------------

# @run
IMAGEMAGICK_POLICY_VERSION=6
IMAGEMAGICK_POLICY_VERSION=7

# @run
IMAGEMAGICK_POLICY_WIDTH=16KP
IMAGEMAGICK_POLICY_WIDTH=48KP

# @run
IMAGEMAGICK_POLICY_HEIGHT=16KP
IMAGEMAGICK_POLICY_HEIGHT=48KPP

# @run
IMAGEMAGICK_POLICY_MAP=512MiB
IMAGEMAGICK_POLICY_MAP=2048MiB

# @run
IMAGEMAGICK_POLICY_MEMORY=256MiB
IMAGEMAGICK_POLICY_MEMORY=2048MiB

# @run
IMAGEMAGICK_POLICY_AREA=128MB
IMAGEMAGICK_POLICY_AREA=4096MB

# @run
IMAGEMAGICK_POLICY_DISK=1GiB
IMAGEMAGICK_POLICY_DISK=6GiB

# @run
IMAGEMAGICK_POLICY_TEMPORARY_PATH=/tmp
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ jobs:
- name: build ${{ inputs.image }}
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: ${{ inputs.context }}
file: ${{ inputs.file }}
provenance: false
push: true
cache-from: type=registry,ref=${{ env.CACHE_REGISTRY }}/${{ inputs.image }}:build-cache
cache-to: type=registry,mode=max,ref=${{ env.CACHE_REGISTRY }}/${{ inputs.image }}:build-cache
Expand Down
Loading

0 comments on commit 4a3d05c

Please sign in to comment.