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