Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0aaae1f

Browse files
author
DKravtsov
committed
improved environment
1 parentddced32 commit0aaae1f

File tree

28 files changed

+2658
-3369
lines changed

28 files changed

+2658
-3369
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ version: 2
22
jobs:
33
build:
44
working_directory:~/html
5-
machine:true
5+
machine:
6+
image:ubuntu-2004:202101-01
67
branches:
78
ignore:
89
-develop

‎Dockerfile‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ ENV DEBUG_ENABLED=$BUILD_ARGUMENT_DEBUG_ENABLED
66
ARG BUILD_ARGUMENT_ENV=dev
77
ENV ENV=$BUILD_ARGUMENT_ENV
88
ENV APP_HOME /var/www/html
9+
ARG UID=1000
10+
ARG GID=1000
11+
ENV USERNAME=www-data
12+
913

1014
# check environment
1115
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 \
2933
libreadline-dev \
3034
supervisor \
3135
cron \
36+
sudo \
3237
libzip-dev \
3338
&& docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
3439
&& docker-php-ext-configure intl \
@@ -47,12 +52,12 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
4752
RUN a2dissite 000-default.conf
4853
RUN rm -r $APP_HOME
4954

50-
# create document root
51-
RUN mkdir -p $APP_HOME/public
52-
53-
# change uid and gid of apache to docker user uid/gid
54-
RUN usermod -u 1000 www-data&& groupmod -g1000 www-data
55-
RUNchown -Rwww-data:www-data $APP_HOME
55+
# create document root, fix permissions for www-data user and change owner to www-data
56+
RUN mkdir -p $APP_HOME/public && \
57+
mkdir -p /home/$USERNAME && chown $USERNAME:$USERNAME /home/$USERNAME \
58+
&& usermod -u $UID $USERNAME -d /home/$USERNAME \
59+
&& groupmod -g$GID $USERNAME \
60+
&&chown -R${USERNAME}:${USERNAME} $APP_HOME
5661

5762
# put apache and php config for Laravel, enable sites
5863
COPY ./docker/general/laravel.conf /etc/apache2/sites-available/laravel.conf
@@ -77,7 +82,7 @@ ENV COMPOSER_ALLOW_SUPERUSER 1
7782
# add supervisor
7883
RUN mkdir -p /var/log/supervisor
7984
COPY --chown=root:root ./docker/general/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
80-
COPY --chown=root:root ./docker/general/cron /var/spool/cron/crontabs/root
85+
COPY --chown=root:crontab ./docker/general/cron /var/spool/cron/crontabs/root
8186
RUN chmod 0600 /var/spool/cron/crontabs/root
8287

8388
# generate certificates
@@ -87,14 +92,11 @@ RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private
8792
# set working directory
8893
WORKDIR $APP_HOME
8994

90-
# create composer folder for user www-data
91-
RUN mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www/.composer
92-
93-
USER www-data
95+
USER ${USERNAME}
9496

9597
# copy source files and config file
96-
COPY --chown=www-data:www-data . $APP_HOME/
97-
COPY --chown=www-data:www-data .env.$ENV $APP_HOME/.env
98+
COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/
99+
COPY --chown=${USERNAME}:${USERNAME} .env.$ENV $APP_HOME/.env
98100

99101
# install all PHP dependencies
100102
RUN if ["$BUILD_ARGUMENT_ENV" ="dev" ] || ["$BUILD_ARGUMENT_ENV" ="test" ]; then COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-interaction --no-progress; \

‎Makefile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ifndef APP_ENV
88
endif
99
endif
1010

11+
laravel_user=-u www-data
1112
project=-p ${COMPOSE_PROJECT_NAME}
1213
service=${COMPOSE_PROJECT_NAME}:latest
1314
interactive:=$(shell [ -t 0 ] && echo 1)
@@ -67,7 +68,7 @@ env-test-ci:
6768
@makeexec cmd="cp ./.env.test-ci ./.env"
6869

6970
ssh:
70-
@docker-compose$(project)exec$(optionT) laravel bash
71+
@docker-compose$(project)exec$(optionT)$(laravel_user)laravel bash
7172

7273
ssh-supervisord:
7374
@docker-compose$(project)exec supervisord bash
@@ -76,10 +77,13 @@ ssh-mysql:
7677
@docker-compose$(project)exec mysql bash
7778

7879
exec:
79-
@docker-compose$(project)exec$(optionT) laravel$$cmd
80+
@docker-compose$(project)exec$(optionT)$(laravel_user)laravel$$cmd
8081

8182
exec-bash:
82-
@docker-compose$(project)exec$(optionT) laravel bash -c"$(cmd)"
83+
@docker-compose$(project)exec$(optionT)$(laravel_user) laravel bash -c"$(cmd)"
84+
85+
exec-by-root:
86+
@docker-compose$(project)exec$(optionT) laravel$$cmd
8387

8488
report-prepare:
8589
mkdir -p$(dir)/reports/coverage
@@ -153,7 +157,7 @@ ecs-fix: ## Run The Easy Coding Standard to fix issues
153157

154158
###> phpmetrics ###
155159
phpmetrics:
156-
@makeexec cmd="make phpmetrics-process"
160+
@make exec-by-root cmd="make phpmetrics-process"
157161

158162
phpmetrics-process:## Generates PhpMetrics static analysis, should be run inside symfony container
159163
@mkdir -p reports/phpmetrics
@@ -163,7 +167,7 @@ phpmetrics-process: ## Generates PhpMetrics static analysis, should be run insid
163167
fi;
164168
@echo"\033[32mRunning PhpMetrics\033[39m"
165169
@php ./vendor/bin/phpmetrics --version
166-
@./vendor/bin/phpmetrics --junit=reports/junit.xml --report-html=reports/phpmetrics.
170+
@php./vendor/bin/phpmetrics --junit=reports/junit.xml --report-html=reports/phpmetrics.
167171
###< phpmetrics ###
168172

169173
###> php copy/paste detector ###

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp