Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into feature/MF-62/…
Browse files Browse the repository at this point in the history
…PHP-8.2
  • Loading branch information
rjzondervan committed Jan 29, 2024
2 parents d1f2e01 + b1d3e68 commit c73458b
Show file tree
Hide file tree
Showing 76 changed files with 4,281 additions and 1,691 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/productpage-deploy
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: My Product Page Workflow

on:
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Deploy Product Github Page
uses: OpenCatalogi/[email protected]
5 changes: 5 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
version: 2

build:
os: ubuntu-22.04
tools:
python: "3.11"

# Build all formats
formats: all

Expand Down
5 changes: 5 additions & 0 deletions api/.env
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ DATABASE_URL="postgresql://db_user:[email protected]:5432/db_name?serverVers
###> nelmio/cors-bundle ###
CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
###< nelmio/cors-bundle ###

###> symfony/sendinblue-mailer ###
# MAILER_DSN=sendinblue+api://KEY@default
# MAILER_DSN=sendinblue+smtp://USERNAME:PASSWORD@default
###< symfony/sendinblue-mailer ###
1 change: 1 addition & 0 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"symfony/proxy-manager-bridge": "5.3.*",
"symfony/runtime": "5.3.*",
"symfony/security-bundle": "5.3.*",
"symfony/sendinblue-mailer": "5.3.*",
"symfony/serializer": "5.3.*",
"symfony/twig-bundle": "5.3.*",
"symfony/validator": "5.3.*",
Expand Down
65 changes: 65 additions & 0 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions api/config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ framework:
app: cache.adapter.redis
system: cache.adapter.redis
default_redis_provider: "redis://%env(REDIS_HOST)%:%env(int:REDIS_PORT)%"


trusted_hosts: "%env(TRUSTED_HOSTS)%"
trusted_proxies: "%env(TRUSTED_PROXIES)%"
trusted_headers: ['x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix']

parameters:
samesite: none
when@test:
Expand Down
8 changes: 8 additions & 0 deletions api/docker/php/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
echo "Creating the database"
bin/console doctrine:database:create --if-not-exists --no-interaction

# Make sure we clear query,result & metadata doctrine cache before migrations during init
if [ "$APP_INIT" = 'true' ]; then
echo "Clearing query,result & metadata doctrine cache"
bin/console doctrine:cache:clear-query
bin/console doctrine:cache:clear-result
bin/console doctrine:cache:clear-metadata
fi

# Get the database inline with the newest version.
echo "Migrating the database to the currently used version"
bin/console doctrine:migrations:migrate --no-interaction
Expand Down
Binary file added api/helm/commonground-gateway-1.5.4.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion api/helm/commonground-gateway/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.5.3
version: 1.5.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
6 changes: 0 additions & 6 deletions api/helm/commonground-gateway/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,6 @@ securityContextNginx:
capabilities:
drop:
- all
add:
- chown
- dac_override
- setgid
- setuid
- net_bind_service
runAsUser: 101
# # Warning: the Nginx image is at this moment not able to run on a read-only filesystem.
# readOnlyRootFilesystem: false
Expand Down
Loading

0 comments on commit c73458b

Please sign in to comment.