Merge branch 'main' into main
This commit is contained in:
commit
465ead50e2
5 changed files with 10 additions and 8 deletions
2
.env
2
.env
|
|
@ -109,5 +109,5 @@ STORAGE_SECRET=!ChangeMe!
|
||||||
###< league/flysystem-bundle ###
|
###< league/flysystem-bundle ###
|
||||||
|
|
||||||
###> symfony/brevo-notifier ###
|
###> symfony/brevo-notifier ###
|
||||||
# BREVO_DSN=brevo://API_KEY@default?sender=SENDER
|
BREVO_DSN=brevo://API_KEY@default?sender=SENDER
|
||||||
###< symfony/brevo-notifier ###
|
###< symfony/brevo-notifier ###
|
||||||
|
|
|
||||||
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
|
|
@ -11,11 +11,11 @@ jobs:
|
||||||
- name: Build/Push
|
- name: Build/Push
|
||||||
uses: coopTilleuls/action-docker-build-push@v10
|
uses: coopTilleuls/action-docker-build-push@v10
|
||||||
with:
|
with:
|
||||||
IMAGE_NAME: plateforme-ebs-php
|
IMAGE_NAME: ebs-php
|
||||||
BUILD_CONTEXT: .
|
BUILD_CONTEXT: .
|
||||||
BUILD_TARGET: app_php
|
BUILD_TARGET: app_php
|
||||||
REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
|
REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
|
||||||
IMAGE_REPOSITORY: ghcr.io/Apes-HDF
|
IMAGE_REPOSITORY: ghcr.io/Tipimi-fr
|
||||||
|
|
||||||
build-push-caddy:
|
build-push-caddy:
|
||||||
# Same Dockerfile as php, with a build target which is after
|
# Same Dockerfile as php, with a build target which is after
|
||||||
|
|
@ -26,8 +26,8 @@ jobs:
|
||||||
- name: Build/Push
|
- name: Build/Push
|
||||||
uses: coopTilleuls/action-docker-build-push@v10
|
uses: coopTilleuls/action-docker-build-push@v10
|
||||||
with:
|
with:
|
||||||
IMAGE_NAME: plateforme-ebs-caddy
|
IMAGE_NAME: ebs-caddy
|
||||||
BUILD_CONTEXT: .
|
BUILD_CONTEXT: .
|
||||||
BUILD_TARGET: app_caddy
|
BUILD_TARGET: app_caddy
|
||||||
REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
|
REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
|
||||||
IMAGE_REPOSITORY: ghcr.io/Apes-HDF
|
IMAGE_REPOSITORY: ghcr.io/Tipimi-fr
|
||||||
|
|
|
||||||
2
.github/workflows/deploy.yml
vendored
2
.github/workflows/deploy.yml
vendored
|
|
@ -51,7 +51,7 @@ jobs:
|
||||||
id: meta
|
id: meta
|
||||||
run: |
|
run: |
|
||||||
set -xo pipefail
|
set -xo pipefail
|
||||||
PROJECT=plateforme-ebs
|
PROJECT=tipimi-ebs
|
||||||
# Tags are deployed in prod
|
# Tags are deployed in prod
|
||||||
CONTEXT=prod
|
CONTEXT=prod
|
||||||
ENVIRONMENT=prod
|
ENVIRONMENT=prod
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
|
|
||||||
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
|
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
|
||||||
|
|
||||||
ARG PHP_VERSION=8.1.32
|
ARG PHP_VERSION=8.1.32
|
||||||
ARG CADDY_VERSION=2.10.0
|
ARG CADDY_VERSION=2.10.0
|
||||||
|
|
||||||
|
|
@ -190,6 +191,7 @@ FROM caddy:${CADDY_VERSION}-builder-alpine AS app_caddy_builder
|
||||||
|
|
||||||
# FROM caddy:2.9.1-builder-alpine AS app_caddy_builder
|
# FROM caddy:2.9.1-builder-alpine AS app_caddy_builder
|
||||||
|
|
||||||
|
|
||||||
# RUN xcaddy build \
|
# RUN xcaddy build \
|
||||||
# --with github.com/dunglas/mercure \
|
# --with github.com/dunglas/mercure \
|
||||||
# --with github.com/dunglas/mercure/caddy \
|
# --with github.com/dunglas/mercure/caddy \
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
php:
|
php:
|
||||||
image:
|
image:
|
||||||
repository: "ghcr.io/apes-hdf/plateforme-ebs-php" # CHANGE ME
|
repository: "ghcr.io/tipimi-fr/ebs-php" # CHANGE ME
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
# Overrides the image tag whose default is the chart appVersion.
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
tag: ""
|
tag: ""
|
||||||
|
|
@ -57,7 +57,7 @@ consumer:
|
||||||
|
|
||||||
caddy:
|
caddy:
|
||||||
image:
|
image:
|
||||||
repository: "ghcr.io/apes-hdf/plateforme-ebs-caddy" # CHANGE ME
|
repository: "ghcr.io/tipimi-fr/ebs-caddy" # CHANGE ME
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
# Overrides the image tag whose default is the chart appVersion.
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
tag: ""
|
tag: ""
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue