Skip to content

Commit

Permalink
Merge pull request #259 from HiEventsDev/fix-docker-configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
daveearley authored Oct 18, 2024
2 parents 1dcf89c + 8d4de9f commit 9460726
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.all-in-one
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM node:alpine AS node-frontend

WORKDIR /app/frontend

ENV PHP_OPCACHE_ENABLE=1

RUN apk add --no-cache yarn

COPY ./frontend/package.json ./frontend/yarn.lock ./
Expand All @@ -14,6 +12,8 @@ RUN yarn install && yarn build

FROM serversideup/php:beta-8.3.2-fpm-alpine

ENV PHP_OPCACHE_ENABLE=1

RUN install-php-extensions intl

RUN apk add --no-cache nodejs yarn nginx supervisor
Expand Down
5 changes: 3 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM serversideup/php:beta-8.3-fpm-nginx-alpine
FROM serversideup/php:8.3-fpm-nginx-alpine

ENV PHP_OPCACHE_ENABLE=1

USER root

# Set `www-data` as the user to start FPM
RUN echo "user = www-data" >> /usr/local/etc/php-fpm.d/docker-php-serversideup-pool.conf && \
RUN echo "" >> /usr/local/etc/php-fpm.d/docker-php-serversideup-pool.conf && \
echo "user = www-data" >> /usr/local/etc/php-fpm.d/docker-php-serversideup-pool.conf && \
echo "group = www-data" >> /usr/local/etc/php-fpm.d/docker-php-serversideup-pool.conf

RUN install-php-extensions intl
Expand Down

0 comments on commit 9460726

Please sign in to comment.