Jenkins fix
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
# ENVIRONMENT
|
# ENVIRONMENT
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
UID=1011
|
UID=1011
|
||||||
CI_ENVIRONMENT = production
|
CI_ENVIRONMENT=production
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# APP
|
# APP
|
||||||
|
|||||||
+4
-3
@@ -1,15 +1,16 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
web:
|
merms-web:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: docker/apache/Dockerfile
|
dockerfile: docker/apache/Dockerfile
|
||||||
args:
|
args:
|
||||||
uid: ${UID}
|
uid: ${UID}
|
||||||
environment:
|
environment:
|
||||||
- APACHE_RUN_USER=#${UID}
|
- APACHE_RUN_USER=${UID}
|
||||||
- APACHE_RUN_GROUP=#${UID}
|
- APACHE_RUN_GROUP=${UID}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
image: registry.chiefsoft.net/merms-web:latest
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/var/www/html
|
- ./:/var/www/html
|
||||||
- ./apache_log:/var/log/apache2
|
- ./apache_log:/var/log/apache2
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
FROM php:7.4-apache
|
FROM php:7.4-apache
|
||||||
RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
|
RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
|
||||||
|
RUN apt-get clean
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
RUN apt-get install -y \
|
RUN apt-get install -y \
|
||||||
git \
|
git \
|
||||||
@@ -48,5 +49,7 @@ ARG uid=1000
|
|||||||
RUN useradd -G www-data,root -u $uid -d /home/devuser devuser
|
RUN useradd -G www-data,root -u $uid -d /home/devuser devuser
|
||||||
RUN mkdir -p /home/devuser/.composer && \
|
RUN mkdir -p /home/devuser/.composer && \
|
||||||
chown -R devuser:devuser /home/devuser
|
chown -R devuser:devuser /home/devuser
|
||||||
|
RUN cd /var/www/html && composer install
|
||||||
|
RUN chmod -R a+w /var/www/html/writable
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
Reference in New Issue
Block a user