Merge branch 'fix-workspace-user-laradock-env' of git://github.com/Lednerb/laradock into Lednerb-fix-workspace-user-laradock-env
# Conflicts: # workspace/Dockerfile-56 # workspace/Dockerfile-70 # workspace/Dockerfile-71
This commit is contained in:
		@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 | 
			
		||||
# Add a non-root user to prevent files being created with root permissions on host machine.
 | 
			
		||||
ARG PUID=1000
 | 
			
		||||
ARG PGID=1000
 | 
			
		||||
RUN groupadd -g $PGID laradock && \
 | 
			
		||||
    useradd -u $PUID -g laradock -m laradock && \
 | 
			
		||||
 | 
			
		||||
ENV PUID ${PUID}
 | 
			
		||||
ENV PGID ${PGID}
 | 
			
		||||
 | 
			
		||||
RUN groupadd -g ${PGID} laradock && \
 | 
			
		||||
    useradd -u ${PUID} -g laradock -m laradock && \
 | 
			
		||||
    apt-get update -yqq
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
 
 | 
			
		||||
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 | 
			
		||||
# Add a non-root user to prevent files being created with root permissions on host machine.
 | 
			
		||||
ARG PUID=1000
 | 
			
		||||
ARG PGID=1000
 | 
			
		||||
RUN groupadd -g $PGID laradock && \
 | 
			
		||||
    useradd -u $PUID -g laradock -m laradock && \
 | 
			
		||||
 | 
			
		||||
ENV PUID ${PUID}
 | 
			
		||||
ENV PGID ${PGID}
 | 
			
		||||
 | 
			
		||||
RUN groupadd -g ${PGID} laradock && \
 | 
			
		||||
    useradd -u ${PUID} -g laradock -m laradock && \
 | 
			
		||||
    apt-get update -yqq
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
 
 | 
			
		||||
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 | 
			
		||||
# Add a non-root user to prevent files being created with root permissions on host machine.
 | 
			
		||||
ARG PUID=1000
 | 
			
		||||
ARG PGID=1000
 | 
			
		||||
RUN groupadd -g $PGID laradock && \
 | 
			
		||||
    useradd -u $PUID -g laradock -m laradock && \
 | 
			
		||||
 | 
			
		||||
ENV PUID ${PUID}
 | 
			
		||||
ENV PGID ${PGID}
 | 
			
		||||
 | 
			
		||||
RUN groupadd -g ${PGID} laradock && \
 | 
			
		||||
    useradd -u ${PUID} -g laradock -m laradock && \
 | 
			
		||||
    apt-get update -yqq
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user