ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1240 from JeromeDesseaux/master 

solving python issue when using INSTALL_NODE=true and VueJS with Laravel.
This commit is contained in:
Mahmoud Zalt 2017-11-12 18:17:45 +02:00 committed by GitHub
parent 34ef36cd7e c5ccc2f4ff
commit 35183eff42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
env-example
View File

@ -322,4 +322,3 @@ PHP_IDE_CONFIG=serverName=laradock
# Fix for windows users to make sure the application path works. # Fix for windows users to make sure the application path works.
COMPOSE_CONVERT_WINDOWS_PATHS=1 COMPOSE_CONVERT_WINDOWS_PATHS=1

6
workspace/Dockerfile-71
View File

@ -52,7 +52,8 @@ ENV PGID ${PGID}
RUN groupadd -g ${PGID} laradock && \ RUN groupadd -g ${PGID} laradock && \
useradd -u ${PUID} -g laradock -m laradock && \ useradd -u ${PUID} -g laradock -m laradock && \
apt-get update -yqq apt-get update -yqq \
apt-get install -y python2.7
##################################### #####################################
# SOAP: # SOAP:
@ -682,7 +683,8 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
# Clean up # Clean up
USER root USER root
RUN apt-get clean && \ RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
npm config set python /usr/bin/python2.7
# Set default work directory # Set default work directory
WORKDIR /var/www WORKDIR /var/www