Commit a0d8665f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige problema con git tras reordenar capas

See merge request redmic-project/docker/web-build!11
parents ed7a45b2 85b6900b

Dockerfile

+4 −4
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ RUN apt-get update && \ 
	apt-get clean && \

	rm -rf /var/lib/apt/lists/*



SHELL ["/bin/sh", "-c"]

RUN git config --global --add safe.directory "*" && \

	git config --global url."https://".insteadOf ssh://



ARG NPM_VERSION \

	GRUNT_CLI_VERSION \

	HOME_PATH \
@@ -55,3 +51,7 @@ USER ${ORIGINAL_UID} 
WORKDIR ${HOME_PATH}



ENV HOME=${HOME_PATH}



SHELL ["/bin/sh", "-c"]

RUN git config --global --add safe.directory "*" && \

	git config --global url."https://".insteadOf ssh://