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

Merge branch 'dev' into 'master'

Dev

See merge request redmic-project/docker/docker-deploy!57
parents 3cc3b4ba e75ed1b7
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
DOCKER_COMPOSE_VERSION=1.27.4
OPENSSH_CLIENT_VERSION=8.1_p1-r0
DOCKER_COMPOSE_VERSION=1.29.2
OPENSSH_CLIENT_VERSION=8.3_p1-r3
+2 −3
Original line number Diff line number Diff line
ARG DOCKER_COMPOSE_VERSION=1.27.4
ARG DOCKER_COMPOSE_VERSION
FROM docker/compose:${DOCKER_COMPOSE_VERSION}

LABEL maintainer="info@redmic.es"

ARG OPENSSH_CLIENT_VERSION=8.1_p1-r0
ARG OPENSSH_CLIENT_VERSION
RUN apk --update --no-cache add \
	openssh-client=${OPENSSH_CLIENT_VERSION}

@@ -13,7 +13,6 @@ RUN \
	for filePath in /script/*; \
	do \
		fileName=$(basename "${filePath}"); \
		chmod 755 "${filePath}"; \
		ln -s "${filePath}" "${binPath}/${fileName}"; \
		ln -s "${filePath}" "${binPath}/${fileName%.*}"; \
	done
+0 −2
Original line number Diff line number Diff line
version: '3.5'

services:
  docker-deploy:
    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/docker/docker-deploy}:${IMAGE_TAG:-latest}

script/_check-deploy.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

script/_definitions.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

Loading