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

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/docker/web-build!3
parents 2ec4dbdc 4d97e629

.env

+2 −2
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@ YARN_VERSION=1.22.5-1 
NODEJS_VERSION=9.11.2-1nodesource1

GRUNT_CLI_VERSION=1.3.2



CACHE_PATH=/opt/cache

WORK_PATH=/opt/redmic
 
HOME_PATH=/redmic

ORIGINAL_UID=1200

Dockerfile

+12 −8
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ LABEL maintainer="info@redmic.es" 


USER root



ARG CACHE_PATH=/opt/cache \

	APT_TRANSPORT_HTTPS_VERSION=1.2.32ubuntu0.2 \

ARG APT_TRANSPORT_HTTPS_VERSION=1.2.32ubuntu0.2 \

	BZIP2_VERSION=1.0.6-8ubuntu0.2 \

	CURL_VERSION=7.47.0-1ubuntu2.18 \

	GIT_VERSION=1:2.7.4-0ubuntu1.9 \
@@ -29,14 +28,19 @@ RUN apt-get update && \ 
		"yarn=${YARN_VERSION}" \

		"nodejs=${NODEJS_VERSION}" && \

	apt-get clean && \

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

	npm install -g "grunt-cli@${GRUNT_CLI_VERSION}" && \

	yarn config set cache-folder "${CACHE_PATH}"

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



USER 1200

ARG HOME_PATH=/redmic \

	ORIGINAL_UID=1200



ARG WORK_PATH=/opt/redmic

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

RUN mkdir -m 777 ${HOME_PATH} && \

	npm install -g "grunt-cli@${GRUNT_CLI_VERSION}"



WORKDIR ${WORK_PATH}

USER ${ORIGINAL_UID}



WORKDIR ${HOME_PATH}



ENV HOME=${HOME_PATH}



ENTRYPOINT []

docker-compose.yml

+2 −2
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ services: 
        YARN_VERSION:

        NODEJS_VERSION:

        GRUNT_CLI_VERSION:

        CACHE_PATH:

        WORK_PATH:
 
        HOME_PATH:

        ORIGINAL_UID: