فهرست منبع

Fixed docker permissions

Ramon Robben 4 سال پیش
والد
کامیت
21ea518d78
3فایلهای تغییر یافته به همراه9 افزوده شده و 9 حذف شده
  1. 2 2
      docker/docker-compose.yml
  2. 2 2
      docker/nginx/Dockerfile
  3. 5 5
      docker/php/Dockerfile

+ 2 - 2
docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     ports:
     ports:
       - 80:80
       - 80:80
     volumes:
     volumes:
-      - ../:/var/www/html:delegated
+      - "../:/var/www/html:delegated"
     depends_on:
     depends_on:
       - php
       - php
       - mysql
       - mysql
@@ -42,7 +42,7 @@ services:
       dockerfile: docker/php/Dockerfile
       dockerfile: docker/php/Dockerfile
     container_name: controlpanel_php
     container_name: controlpanel_php
     volumes:
     volumes:
-      - ../:/var/www/html:delegated
+      - "../:/var/www/html:delegated"
     networks:
     networks:
       - laravel
       - laravel
 
 

+ 2 - 2
docker/nginx/Dockerfile

@@ -1,10 +1,10 @@
 FROM nginx:stable-alpine
 FROM nginx:stable-alpine
 
 
+RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
+
 ADD ./docker/nginx/nginx.conf /etc/nginx/
 ADD ./docker/nginx/nginx.conf /etc/nginx/
 ADD ./docker/nginx/default.conf /etc/nginx/conf.d/
 ADD ./docker/nginx/default.conf /etc/nginx/conf.d/
 
 
 RUN mkdir -p /var/www/html
 RUN mkdir -p /var/www/html
 
 
-RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
-
 RUN chown laravel:laravel /var/www/html
 RUN chown laravel:laravel /var/www/html

+ 5 - 5
docker/php/Dockerfile

@@ -6,16 +6,16 @@ RUN apk add --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/
 RUN apk add --no-cache curl-dev icu-dev libzip-dev
 RUN apk add --no-cache curl-dev icu-dev libzip-dev
 RUN docker-php-ext-install mysqli pdo pdo_mysql intl zip
 RUN docker-php-ext-install mysqli pdo pdo_mysql intl zip
 
 
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-
 ADD ./docker/php/www.conf /usr/local/etc/php-fpm.d/
 ADD ./docker/php/www.conf /usr/local/etc/php-fpm.d/
 
 
-RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
-
 RUN mkdir -p /var/www/html
 RUN mkdir -p /var/www/html
 
 
+RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
 RUN chown laravel:laravel /var/www/html
 RUN chown laravel:laravel /var/www/html
 
 
 WORKDIR /var/www/html
 WORKDIR /var/www/html
 
 
-RUN docker-php-ext-install pdo pdo_mysql
+USER laravel
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+