Commit 8110a50c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Comienza migración a Compose v2 

Cambia imagen base a la oficial de Docker, en lugar de la ya obsoleta
docker/compose (ahora es legacy para Compose v1).

Actualiza versión de dependencias y renombra argumentos de construcción.

Renombra fichero docker-compose.yml a la nueva nomenclatura preferida,
compose.yaml. Actualiza referencias.
parent e75ed1b7

.env

+2 −2
Original line number Diff line number Diff line 
DOCKER_COMPOSE_VERSION=1.29.2

OPENSSH_CLIENT_VERSION=8.3_p1-r3
 
DOCKER_VERSION=24.0.7-cli-alpine3.18

OPENSSH_VERSION=9.3_p2-r0

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ stages: 


.docker-build:

  variables:

    COMPOSE_FILE_NAME: docker-compose.yml
 
    COMPOSE_FILE_NAME: compose.yaml

Dockerfile

+4 −4
Original line number Diff line number Diff line 
ARG DOCKER_COMPOSE_VERSION

FROM docker/compose:${DOCKER_COMPOSE_VERSION}

ARG DOCKER_VERSION

FROM docker:${DOCKER_VERSION}



LABEL maintainer="info@redmic.es"



ARG OPENSSH_CLIENT_VERSION

ARG OPENSSH_VERSION

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

	openssh-client=${OPENSSH_CLIENT_VERSION}

	openssh-client-default=${OPENSSH_VERSION}



COPY script/ /script/

RUN \

docker-compose.yml→compose.yaml

+2 −2
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ services: 
      context: .

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        DOCKER_COMPOSE_VERSION:

        OPENSSH_CLIENT_VERSION:
 
        DOCKER_VERSION:

        OPENSSH_VERSION: