Skip to content

Commit b9eefab

Browse files
author
DKravtsov
committed
Improved Makefile commands, updated packages, small refactoring
1 parent 23cc750 commit b9eefab

File tree

119 files changed

+1631
-2058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1631
-2058
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
FROM php:8.1-fpm
22

33
# set main params
4-
ARG BUILD_ARGUMENT_DEBUG_ENABLED=false
5-
ENV DEBUG_ENABLED=$BUILD_ARGUMENT_DEBUG_ENABLED
64
ARG BUILD_ARGUMENT_ENV=dev
75
ENV ENV=$BUILD_ARGUMENT_ENV
86
ENV APP_HOME /var/www/html
9-
ARG UID=1000
10-
ARG GID=1000
7+
ARG HOST_UID=1000
8+
ARG HOST_GID=1000
119
ENV USERNAME=www-data
10+
ARG INSIDE_DOCKER_CONTAINER=1
11+
ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
1212

1313
# check environment
1414
RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev" && exit 2; \
@@ -55,8 +55,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
5555
# create document root, fix permissions for www-data user and change owner to www-data
5656
RUN mkdir -p $APP_HOME/public && \
5757
mkdir -p /home/$USERNAME && chown $USERNAME:$USERNAME /home/$USERNAME \
58-
&& usermod -u $UID $USERNAME -d /home/$USERNAME \
59-
&& groupmod -g $GID $USERNAME \
58+
&& usermod -u $HOST_UID $USERNAME -d /home/$USERNAME \
59+
&& groupmod -g $HOST_GID $USERNAME \
6060
&& chown -R ${USERNAME}:${USERNAME} $APP_HOME
6161

6262
# put php config for Symfony

0 commit comments

Comments
 (0)