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

Merge branch 'dev' into 'master' 

Añade indicador de versión y ajusta CI

See merge request redmic-project/docker/docker-deploy!60
parents 86912c5a 199db6f4

.env

+1 −0
Original line number Diff line number Diff line 
DOCKER_VERSION=24.0.7-cli-alpine3.18

OPENSSH_VERSION=9.3_p2-r0

VERSION=unknown version

.gitlab-ci.yml

+10 −2
Original line number Diff line number Diff line
@@ -8,6 +8,14 @@ stages: 
  - package

  - post-package



.docker-build:

docker-build-support-branch:

  variables:

    COMPOSE_FILE_NAME: compose.yaml
 
    VERSION: ${CI_COMMIT_SHORT_SHA}



docker-build-stable-branch:

  variables:

    VERSION: ${CI_COMMIT_SHORT_SHA}



docker-build-tag:

  variables:

    VERSION: ${CI_COMMIT_TAG}

Dockerfile

+7 −2
Original line number Diff line number Diff line
@@ -3,9 +3,14 @@ FROM docker:${DOCKER_VERSION} 


LABEL maintainer="info@redmic.es"



ARG OPENSSH_VERSION

ARG VERSION \

	OPENSSH_VERSION



LABEL version=${VERSION}

ENV VERSION=${VERSION}



RUN apk --update --no-cache add \

	openssh-client-default=${OPENSSH_VERSION}

	openssh-client-default="${OPENSSH_VERSION}"



COPY script/ /script/

RUN \

compose.yaml

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ services: 
      args:

        DOCKER_VERSION:

        OPENSSH_VERSION:

        VERSION:

script/_definitions.sh

+2 −0
Original line number Diff line number Diff line
@@ -29,3 +29,5 @@ NULL_COLOR='\033[0m' 
SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=error \

	-o "ControlPath=\"/ssh_connection_socket_%h_%p_%r\"" -o ControlMaster=auto \

	-o ControlPersist=${SSH_CONTROL_PERSIST} -o Port=${SSH_PORT}"



echo -e "${INFO_COLOR}*** Docker deploy [${VERSION}] ***${NULL_COLOR}\n"