improved environment

Author: DKravtsov

.circleci/config.yml

@@ -2,7 +2,8 @@ version: 2
 jobs:
   build:
     working_directory: ~/html
-    machine: true
+    machine:
+        image: ubuntu-2004:202101-01
     branches:
         ignore:
           - develop

Dockerfile

@@ -6,6 +6,10 @@ ENV DEBUG_ENABLED=$BUILD_ARGUMENT_DEBUG_ENABLED
 ARG BUILD_ARGUMENT_ENV=dev
 ENV ENV=$BUILD_ARGUMENT_ENV
 ENV APP_HOME /var/www/html
+ARG UID=1000
+ARG GID=1000
+ENV USERNAME=www-data
+
 
 # check environment
 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; \
@@ -29,6 +33,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       libreadline-dev \
       supervisor \
       cron \
+      sudo \
       libzip-dev \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
     && docker-php-ext-configure intl \
@@ -47,12 +52,12 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
 RUN a2dissite 000-default.conf
 RUN rm -r $APP_HOME
 
-# create document root
-RUN mkdir -p $APP_HOME/public
-
-# change uid and gid of apache to docker user uid/gid
-RUN usermod -u 1000 www-data && groupmod -g 1000 www-data
-RUN chown -R www-data:www-data $APP_HOME
+# create document root, fix permissions for www-data user and change owner to www-data
+RUN mkdir -p $APP_HOME/public && \
+    mkdir -p /home/$USERNAME && chown $USERNAME:$USERNAME /home/$USERNAME \
+    && usermod -u $UID $USERNAME -d /home/$USERNAME \
+    && groupmod -g $GID $USERNAME \
+    && chown -R ${USERNAME}:${USERNAME} $APP_HOME
 
 # put apache and php config for Laravel, enable sites
 COPY ./docker/general/laravel.conf /etc/apache2/sites-available/laravel.conf
@@ -77,7 +82,7 @@ ENV COMPOSER_ALLOW_SUPERUSER 1
 # add supervisor
 RUN mkdir -p /var/log/supervisor
 COPY --chown=root:root ./docker/general/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY --chown=root:root ./docker/general/cron /var/spool/cron/crontabs/root
+COPY --chown=root:crontab ./docker/general/cron /var/spool/cron/crontabs/root
 RUN chmod 0600 /var/spool/cron/crontabs/root
 
 # generate certificates
@@ -87,14 +92,11 @@ RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private
 # set working directory
 WORKDIR $APP_HOME
 
-# create composer folder for user www-data
-RUN mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www/.composer
-
-USER www-data
+USER ${USERNAME}
 
 # copy source files and config file
-COPY --chown=www-data:www-data . $APP_HOME/
-COPY --chown=www-data:www-data .env.$ENV $APP_HOME/.env
+COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/
+COPY --chown=${USERNAME}:${USERNAME} .env.$ENV $APP_HOME/.env
 
 # install all PHP dependencies
 RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-interaction --no-progress; \

Makefile

@@ -8,6 +8,7 @@ ifndef APP_ENV
 	endif
 endif
 
+laravel_user=-u www-data
 project=-p ${COMPOSE_PROJECT_NAME}
 service=${COMPOSE_PROJECT_NAME}:latest
 interactive:=$(shell [ -t 0 ] && echo 1)
@@ -67,7 +68,7 @@ env-test-ci:
 	@make exec cmd="cp ./.env.test-ci ./.env"
 
 ssh:
-	@docker-compose $(project) exec $(optionT) laravel bash
+	@docker-compose $(project) exec $(optionT) $(laravel_user) laravel bash
 
 ssh-supervisord:
 	@docker-compose $(project) exec supervisord bash
@@ -76,10 +77,13 @@ ssh-mysql:
 	@docker-compose $(project) exec mysql bash
 
 exec:
-	@docker-compose $(project) exec $(optionT) laravel $$cmd
+	@docker-compose $(project) exec $(optionT) $(laravel_user) laravel $$cmd
 
 exec-bash:
-	@docker-compose $(project) exec $(optionT) laravel bash -c "$(cmd)"
+	@docker-compose $(project) exec $(optionT) $(laravel_user) laravel bash -c "$(cmd)"
+
+exec-by-root:
+	@docker-compose $(project) exec $(optionT) laravel $$cmd
 
 report-prepare:
 	mkdir -p $(dir)/reports/coverage
@@ -153,7 +157,7 @@ ecs-fix: ## Run The Easy Coding Standard to fix issues
 
 ###> phpmetrics ###
 phpmetrics:
-	@make exec cmd="make phpmetrics-process"
+	@make exec-by-root cmd="make phpmetrics-process"
 
 phpmetrics-process: ## Generates PhpMetrics static analysis, should be run inside symfony container
 	@mkdir -p reports/phpmetrics
@@ -163,7 +167,7 @@ phpmetrics-process: ## Generates PhpMetrics static analysis, should be run insid
 	fi;
 	@echo "\033[32mRunning PhpMetrics\033[39m"
 	@php ./vendor/bin/phpmetrics --version
-	@./vendor/bin/phpmetrics --junit=reports/junit.xml --report-html=reports/phpmetrics .
+	@php ./vendor/bin/phpmetrics --junit=reports/junit.xml --report-html=reports/phpmetrics .
 ###< phpmetrics ###
 
 ###> php copy/paste detector ###