-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
merge in updates from recent projects and move to OrbStack #21
Merged
Merged
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
09f2a93
ci: use volta npm when running tests
joelclermont 3c4847a
ci: use composer caching script
joelclermont 64d9aaa
add missing composer version
joelclermont 0af6139
remove obsolete docker compose version
joelclermont f93feff
mysql version bump, normalize env, simplify config as default
joelclermont 2fb7bf9
redis version bump
joelclermont 655c57b
update domains for orbstack .local
joelclermont 4347c6c
more orbstack updates
joelclermont 298ab66
more orbstack tweaks and php, nginx version bumps
joelclermont f28639b
allow js tests to pass nothing defined, action bumps for node 20
joelclermont cd6042a
tweak caching in ci
joelclermont 955c756
pr fixes
joelclermont File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,51 +14,51 @@ | |
## - Make sure to enable the performance optimization for Macs, if you're running on macOS 12.2 or higher. | ||
## From Docker Desktop, go to Settings, Experimental Features and enable both settings for virtualization and VirtioFS. | ||
######################################################################################################################## | ||
version: "3.9" | ||
|
||
services: | ||
|
||
## The App database | ||
mysql: | ||
container_name: "${COMPOSE_PROJECT_NAME}-mysql" | ||
image: mysql:8.0.35 | ||
image: mysql:8.0.37 | ||
volumes: | ||
- mysql-data:/var/lib/mysql | ||
# Uncomment the next line if you need scripts to run on mysql initialization, like creating multiple databases | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not just leave it uncommented? Shouldn't hurt anything. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed |
||
# - ./docker/mysql/init:/docker-entrypoint-initdb.d | ||
environment: | ||
- MYSQL_ROOT_PASSWORD=password | ||
- MYSQL_DATABASE=app # update .env and .env.example if you change any of these values | ||
- MYSQL_USER=app | ||
- MYSQL_PASSWORD=app | ||
ports: | ||
- "${DOCKER_MYSQL_LOCAL_PORT}:3306" | ||
command: | ||
- "--character-set-server=utf8mb4" | ||
- "--collation-server=utf8mb4_unicode_ci" | ||
- "--default-authentication-plugin=mysql_native_password" | ||
MYSQL_ROOT_PASSWORD: password | ||
MYSQL_DATABASE: app # update .env and .env.example if you change any of these values | ||
MYSQL_USER: app | ||
MYSQL_PASSWORD: app | ||
# Uncomment the command section if you need to deviate from MySQL defaults (like on a legacy database schema) | ||
# command: | ||
# - "--character-set-server=utf8mb4" | ||
# - "--collation-server=utf8mb4_0900_ai_ci" | ||
# - "--default-authentication-plugin=caching_sha2_password" | ||
restart: unless-stopped | ||
|
||
## MySQL just for Unit Tests | ||
mysql-test: | ||
container_name: "${COMPOSE_PROJECT_NAME}-mysql-test" | ||
image: mysql:8.0.35 | ||
image: mysql:8.0.37 | ||
volumes: | ||
- mysql-test-data:/var/lib/mysql | ||
# Uncomment the next line if you need scripts to run on mysql initialization, like creating multiple databases | ||
# - ./docker/mysql/init:/docker-entrypoint-initdb.d | ||
environment: | ||
- MYSQL_ROOT_PASSWORD=password | ||
- MYSQL_DATABASE=apptest # update phpunit.xml if you change any of these values | ||
- MYSQL_USER=app | ||
- MYSQL_PASSWORD=app | ||
command: | ||
- "--character-set-server=utf8mb4" | ||
- "--collation-server=utf8mb4_unicode_ci" | ||
- "--default-authentication-plugin=mysql_native_password" | ||
MYSQL_ROOT_PASSWORD: password | ||
MYSQL_DATABASE: apptest # update phpunit.xml if you change any of these values | ||
MYSQL_USER: app | ||
MYSQL_PASSWORD: app | ||
# Uncomment the command section if you need to deviate from MySQL defaults (like on a legacy database schema) | ||
# command: | ||
# - "--character-set-server=utf8mb4" | ||
# - "--collation-server=utf8mb4_0900_ai_ci" | ||
# - "--default-authentication-plugin=caching_sha2_password" | ||
restart: unless-stopped | ||
|
||
redis: | ||
container_name: "${COMPOSE_PROJECT_NAME}-redis" | ||
image: redis:7.0.5-alpine3.17 | ||
ports: | ||
- "${DOCKER_REDIS_LOCAL_PORT}:6379" | ||
image: redis:7.2.5-alpine3.20 | ||
restart: unless-stopped | ||
|
||
## NGINX to support the app, configured to use the php-fpm-debug server | ||
|
@@ -71,8 +71,8 @@ services: | |
working_dir: /app | ||
volumes: | ||
- .:/app | ||
ports: | ||
- "${DOCKER_NGINX_LOCAL_PORT}:443" | ||
labels: | ||
- "dev.orbstack.domains=${DOCKER_SERVER_NAME}" | ||
depends_on: | ||
- php-fpm-debug | ||
restart: unless-stopped | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
FROM nginx:1.22.0-alpine | ||
FROM nginx:1.27.0-alpine3.19 | ||
|
||
COPY nginx.conf /etc/nginx/conf.d/default.conf | ||
COPY ssl.pem /etc/nginx/ssl.pem | ||
COPY key.pem /etc/nginx/key.pem |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,26 @@ | ||
server { | ||
listen 443 ssl; | ||
ssl_certificate /etc/nginx/ssl.pem; | ||
ssl_certificate_key /etc/nginx/key.pem; | ||
listen 80; | ||
root /app/public; | ||
add_header X-Frame-Options "SAMEORIGIN"; | ||
add_header X-Content-Type-Options "nosniff"; | ||
index index.php; | ||
|
||
if (!-e $request_filename) { | ||
rewrite ^.*$ /index.php last; | ||
charset utf-8; | ||
location / { | ||
try_files $uri $uri/ /index.php?$query_string; | ||
} | ||
|
||
location = /favicon.ico { access_log off; log_not_found off; } | ||
location = /robots.txt { access_log off; log_not_found off; } | ||
error_page 404 /index.php; | ||
location ~ \.php$ { | ||
fastcgi_pass php-fpm-debug:9000; | ||
fastcgi_index index.php; | ||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; | ||
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; | ||
include fastcgi_params; | ||
fastcgi_read_timeout 300; | ||
} | ||
location ~ /\.(?!well-known).* { | ||
deny all; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
*.pem |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should these be in docker/nginx anymore? Because they're for Vite.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually looks like you've got a .gitignore for vite dir further down - so this is probably just the wrong path here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed