Commit 704ef422 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actuaiza base, deps y config 

Parte de última versión de selenium-chrome e instala la última versión
de Node. Fija al máximo el tag de la imagen base.

Instala Yarn mediante NPM en lugar de Apt.

Añade variable para elegir la fuente de instalación de Node al variar la
versión mediante args.

Actualiza dependencias al máximo.
parent 9755108f

.env

+8 −7
Original line number Diff line number Diff line 
SELENIUM_NODE_CHROME_VERSION=90.0.4430.85-20210422

SELENIUM_NODE_CHROME_VERSION=101.0.4951.41-chromedriver-101.0.4951.41-grid-4.1.4-20220427



APT_TRANSPORT_HTTPS_VERSION=2.0.5

APT_TRANSPORT_HTTPS_VERSION=2.0.6

BZIP2_VERSION=1.0.8-2

CURL_VERSION=7.68.0-1ubuntu2.5

GIT_VERSION=1:2.25.1-1ubuntu3.1

YARN_VERSION=1.22.5-1

NODEJS_VERSION=12.22.1-deb-1nodesource1

GRUNT_CLI_VERSION=1.4.2

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

YARN_VERSION=1.22.18

GRUNT_CLI_VERSION=1.4.3



HOME_PATH=/redmic

ORIGINAL_UID=1200

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

Dockerfile

+13 −13
Original line number Diff line number Diff line 
ARG SELENIUM_NODE_CHROME_VERSION=90.0.4430.85-20210422

ARG SELENIUM_NODE_CHROME_VERSION=101.0.4951.41-chromedriver-101.0.4951.41-grid-4.1.4-20220427

FROM selenium/node-chrome:${SELENIUM_NODE_CHROME_VERSION}



LABEL maintainer="info@redmic.es"



USER root



ARG APT_TRANSPORT_HTTPS_VERSION=2.0.5 \

ARG APT_TRANSPORT_HTTPS_VERSION=2.0.6 \

	BZIP2_VERSION=1.0.8-2 \

	CURL_VERSION=7.68.0-1ubuntu2.5 \

	GIT_VERSION=1:2.25.1-1ubuntu3.1 \

	YARN_VERSION=1.22.5-1 \

	NODEJS_VERSION=12.22.1-deb-1nodesource1

	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



SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN apt-get update && \
@@ -24,26 +24,26 @@ RUN apt-get update && \ 
		"bzip2=${BZIP2_VERSION}" \

		"curl=${CURL_VERSION}" \

		"git=${GIT_VERSION}" && \

	curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

	echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \

	curl -sL https://deb.nodesource.com/setup_12.x | bash - && \

	curl -fsSL "https://deb.nodesource.com/setup_${NODEJS_SOURCE}.x" | bash - && \

	apt-get update && \

	apt-cache madison \

		yarn \

		nodejs && \

	apt-get install -y --no-install-recommends \

		"yarn=${YARN_VERSION}" \

		"nodejs=${NODEJS_VERSION}" && \

	apt-get clean && \

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



ARG HOME_PATH=/redmic \

	ORIGINAL_UID=1200 \

	GRUNT_CLI_VERSION=1.4.2

	YARN_VERSION=1.22.18 \

	GRUNT_CLI_VERSION=1.4.3



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

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

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

	npm install -g \

		npm \

		"yarn@${YARN_VERSION}" \

		"grunt-cli@${GRUNT_CLI_VERSION}"



USER ${ORIGINAL_UID}

docker-compose.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  web-build: