Skip to content
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.

Sign up for GitHub

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

Jump to bottom

few small tweaks #22

Merged
merged 1 commit into from
Sep 6, 2024
Merged

few small tweaks #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions README_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ If you don't want to run `dnsmasq`, you can also add a manual DNS entry to your

### Setting up an SSL certificate

First, you'll need to create an SSL certificate that can be used inside Docker. We'll use `mkcert`, a simple tool for
making locally-trusted development certificates.
Orbstack provides automatic TLS certificates for `.local` domains, but we will also need to create one that Vite can use.
aaronsaray marked this conversation as resolved.
Show resolved Hide resolved

To do this, we'll use `mkcert`, a simple tool for making locally-trusted development certificates.

To install on Mac with Homebrew, you can run:

Expand All @@ -61,6 +62,8 @@ Then, generate the certificates for this project and put them into a location ac

`mkcert -cert-file docker/vite/ssl.pem -key-file docker/vite/key.pem my-project.test`

We're using the `.test` top-level domain for the Vite server.

### Node environment
The best option to ensure you're using the correct versions of Node and npm with this project is to install [Volta](https://volta.sh).
Volta will read the pinned versions of Node and npm from the `package.json` so you can be sure you're using the correct versions.
Expand Down
4 changes: 2 additions & 2 deletions docker/php-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3.8-fpm-alpine3.20 as base
FROM php:8.3.11-fpm-alpine3.20 AS base

RUN apk add --no-cache $PHPIZE_DEPS \
freetype-dev \
Expand All @@ -21,7 +21,7 @@ COPY --from=composer:2.7.7 /usr/bin/composer /usr/bin/composer

COPY docker-php-file-uploads.ini /usr/local/etc/php/conf.d/docker-php-file-uploads.ini

FROM base as debug
FROM base AS debug

# Supports xdebug
RUN apk add --update linux-headers
Expand Down