Commit ed7a45b2 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!10
parents 21dfe432 cf77ef5f

.env

+10 −11
Original line number Diff line number Diff line 
SELENIUM_NODE_CHROME_VERSION=101.0.4951.41-chromedriver-101.0.4951.41-grid-4.1.4-20220427

SELENIUM_NODE_CHROME_VERSION=127.0.6533.72-chromedriver-127.0.6533.72-grid-4.23.0-20240727



APT_TRANSPORT_HTTPS_VERSION=2.0.6

BZIP2_VERSION=1.0.8-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

APT_TRANSPORT_HTTPS_VERSION=2.7.14build2

BZIP2_VERSION=1.0.8-5.1

CURL_VERSION=8.5.0-2ubuntu10.1

GIT_VERSION=1:2.43.0-1ubuntu7.1

NODEJS_SOURCE=20

NODEJS_VERSION=20.16.0-1nodesource1



NPM_VERSION=8.8.0

YARN_VERSION=1.22.18

GRUNT_CLI_VERSION=1.4.3

NPM_VERSION=10.8.1

GRUNT_CLI_VERSION=1.5.0



HOME_PATH=/redmic

HOME_PATH=/package

ORIGINAL_UID=1200

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/packaging.yml'

    file: '/packaging-docker/docker-build.yml'



stages:

  - pre-package

  - package

  - post-package
 


.docker-build:

  variables:

    COMPOSE_FILE_NAME: docker-compose.yml

Dockerfile

+17 −18
Original line number Diff line number Diff line 
ARG SELENIUM_NODE_CHROME_VERSION=101.0.4951.41-chromedriver-101.0.4951.41-grid-4.1.4-20220427

ARG SELENIUM_NODE_CHROME_VERSION

FROM selenium/node-chrome:${SELENIUM_NODE_CHROME_VERSION}



LABEL maintainer="info@redmic.es"



ENTRYPOINT []



USER root



ARG APT_TRANSPORT_HTTPS_VERSION=2.0.6 \

	BZIP2_VERSION=1.0.8-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

ARG APT_TRANSPORT_HTTPS_VERSION \

	BZIP2_VERSION \

	CURL_VERSION \

	GIT_VERSION \

	NODEJS_SOURCE \

	NODEJS_VERSION



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

RUN apt-get update && \
@@ -33,17 +35,19 @@ RUN apt-get update && \ 
	apt-get clean && \

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



ARG NPM_VERSION=8.8.0 \

	YARN_VERSION=1.22.18 \

	GRUNT_CLI_VERSION=1.4.3 \

	HOME_PATH=/redmic \

	ORIGINAL_UID=1200

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 \

	ORIGINAL_UID



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

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

	npm install -g \

		"npm@${NPM_VERSION}" \

		"yarn@${YARN_VERSION}" \

		"grunt-cli@${GRUNT_CLI_VERSION}"



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



ENV HOME=${HOME_PATH}
 


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

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



ENTRYPOINT []

docker-compose.yml→compose.yaml

+0 −3
Original line number Diff line number Diff line 
version: '3.9'



services:

  web-build:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/docker/web-build}:${IMAGE_TAG:-latest}
@@ -15,7 +13,6 @@ services: 
        NODEJS_SOURCE:

        NODEJS_VERSION:

        NPM_VERSION:

        YARN_VERSION:

        GRUNT_CLI_VERSION:

        HOME_PATH:

        ORIGINAL_UID:

README.md

+1 −1

File changed.

Contains only whitespace changes.