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

Merge branch 'dev' into 'master' 

Fija versión NPM, marca dirs seguros, propaga args

See merge request redmic-project/docker/web-build!6
parents ad9b54ed 1b220bcb

.env

+3 −0
Original line number Diff line number Diff line
@@ -6,8 +6,11 @@ CURL_VERSION=7.68.0-1ubuntu2.10 
GIT_VERSION=1:2.25.1-1ubuntu3.4

NODEJS_SOURCE=18

NODEJS_VERSION=18.0.0-deb-1nodesource1



NPM_VERSION=8.8.0

YARN_VERSION=1.22.18

GRUNT_CLI_VERSION=1.4.3



HOME_PATH=/redmic

BUILD_PATH=/builds/redmic-project/client/web

ORIGINAL_UID=1200

Dockerfile

+9 −5
Original line number Diff line number Diff line
@@ -33,15 +33,19 @@ RUN apt-get update && \ 
	apt-get clean && \

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



ARG HOME_PATH=/redmic \

	ORIGINAL_UID=1200 \

ARG NPM_VERSION=8.8.0 \

	YARN_VERSION=1.22.18 \

	GRUNT_CLI_VERSION=1.4.3

	GRUNT_CLI_VERSION=1.4.3 \

	HOME_PATH=/redmic \

	BUILD_PATH=/builds/redmic-project/client/web \

	ORIGINAL_UID=1200



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

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

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

	git config --global --add safe.directory "${HOME_PATH}" && \

	git config --global --add safe.directory "${BUILD_PATH}" && \

	npm install -g \

		npm \

		"npm@${NPM_VERSION}" \

		"yarn@${YARN_VERSION}" \

		"grunt-cli@${GRUNT_CLI_VERSION}"

docker-compose.yml

+4 −1
Original line number Diff line number Diff line
@@ -12,8 +12,11 @@ services: 
        BZIP2_VERSION:

        CURL_VERSION:

        GIT_VERSION:

        YARN_VERSION:

        NODEJS_SOURCE:

        NODEJS_VERSION:

        NPM_VERSION:

        YARN_VERSION:

        GRUNT_CLI_VERSION:

        HOME_PATH:

        BUILD_PATH:

        ORIGINAL_UID: