Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:roadiz/skeleton into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ambroisemaupate committed May 27, 2024
2 parents 0e89490 + 1570c37 commit 27fc5db
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 44 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"nelmio/cors-bundle": "^2.4",
"roadiz/cms-pack": "^2.0.1",
"sentry/sentry-symfony": "^4.13",
"symfony/redis-messenger": "6.4.*",
"symfony/flex": "*",
"symfony/requirements-checker": "^2.0"
},
Expand Down
1 change: 1 addition & 0 deletions composer.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"nelmio/cors-bundle": "^2.4",
"roadiz/cms-pack": "^2.0.1",
"sentry/sentry-symfony": "^4.13",
"symfony/redis-messenger": "6.4.*",
"symfony/flex": "*",
"symfony/requirements-checker": "^2.0"
},
Expand Down
3 changes: 3 additions & 0 deletions config/packages/lexik_jwt_authentication.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
parameters:
env(JWT_PASSPHRASE): '!ChangeMe!'

lexik_jwt_authentication:
secret_key: '%env(resolve:JWT_SECRET_KEY)%'
public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Production template
# Replace “my-registry/roadiz_skeleton” with your own project registry URL
name: skeleton
#name: skeleton
services:
db:
image: mysql:8.0
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.restore.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Restoring from a backup into development environment
# Separate file to avoid running the restore services when using docker-compose up
# docker compose -f docker-compose.restore.yml --env-file .env.local run --rm restore_files
name: skeleton
#name: skeleton
services:
restore_files:
# Keep the same hostname for all Restic services
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.symfony.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Only use this docker compose template if you prefer using symfony server:start
#
name: skeleton
#name: skeleton
services:
db:
build:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: skeleton
#name: skeleton
services:
db:
build:
Expand All @@ -21,8 +21,8 @@ services:

pma:
image: phpmyadmin/phpmyadmin
# ports:
# - ${PUBLIC_PMA_PORT}:80/tcp
ports:
- ${PUBLIC_PMA_PORT}:80/tcp
environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: ${MYSQL_DATABASE}
Expand Down Expand Up @@ -77,8 +77,8 @@ services:

nginx:
image: roadiz/nginx-alpine:latest
# ports:
# - ${PUBLIC_APP_PORT}:80/tcp
ports:
- ${PUBLIC_APP_PORT}:80/tcp
depends_on:
- app
# Nginx does not resolve `app` hostname correctly
Expand Down
36 changes: 0 additions & 36 deletions migrations/Version20221206171114.php

This file was deleted.

0 comments on commit 27fc5db

Please sign in to comment.