Commit 7607c6bb authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Reubica recursos y actualiza versiones 

Separa configuración de construcción y de despliegue en diferentes
ficheros docker-compose, para simplificar. Ajusta configuración de jobs
CI en consecuencia.

Actualiza versión de imagen base y dependencias.
parent 82987bcc

.gitlab-ci.yml

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


.docker-build:

  variables:

    IMAGE_NAME_VARIABLE_NAME: BACKUP_FILES_IMAGE_NAME

    IMAGE_TAG_VARIABLE_NAME: BACKUP_FILES_IMAGE_TAG
 
    COMPOSE_FILE_NAME: docker-compose.build.yml

Dockerfile

+3 −3
Original line number Diff line number Diff line 
ARG ALPINE_IMAGE_TAG=3.13

ARG ALPINE_IMAGE_TAG=3.16.0



FROM alpine:${ALPINE_IMAGE_TAG}



LABEL maintainer="info@redmic.es"



ARG BACKUP_PATH=/backup \

	CURL_VERSION=7.79.1-r0 \

	BASH_VERSION=5.1.0-r0 \

	CURL_VERSION=7.83.1-r2 \

	BASH_VERSION=5.1.16-r2 \

	GLIBC_VERSION=2.33-r0 \

	AWS_CLI_VERSION=2.0.30

deploy/.env

+5 −5
Original line number Diff line number Diff line 
ALPINE_IMAGE_TAG=3.13

CURL_VERSION=7.79.1-r0

BASH_VERSION=5.1.0-r0

ALPINE_IMAGE_TAG=3.16.0

CURL_VERSION=7.83.1-r2

BASH_VERSION=5.1.16-r2

GLIBC_VERSION=2.33-r0

AWS_CLI_VERSION=2.0.30

BACKUP_PATH=/backup



BACKUP_PATH=/backup

WORK_PATH=/tmp/backup



AWS_DEFAULT_REGION=eu-west-1

AWS_ACCESS_KEY_ID=changeme

AWS_SECRET_ACCESS_KEY=changeme

UPLOAD_BUCKET=backup-files

AWS_DEFAULT_REGION=eu-west-1

AWS_OUTPUT=json



PUSHGATEWAY_HOST=pushgateway:9091

deploy/docker-compose.build.yml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
version: '3.9'



services:

  backup-files:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/maintenance/backup-files}:${IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        ALPINE_IMAGE_TAG:

        CURL_VERSION:

        BASH_VERSION:

        GLIBC_VERSION:

        AWS_CLI_VERSION:

        BACKUP_PATH:

    environment:

      BACKUP_PATH:

      WORK_PATH:

      AWS_DEFAULT_REGION:

      AWS_OUTPUT:

      PUSHGATEWAY_HOST:

deploy/docker-compose.tmpl.yml

+0 −10
Original line number Diff line number Diff line
@@ -3,16 +3,6 @@ version: '3.9' 
services:

  backup-files:

    image: ${BACKUP_FILES_IMAGE_NAME:-registry.gitlab.com/redmic-project/maintenance/backup-files}:${BACKUP_FILES_IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${BACKUP_FILES_DOCKERFILE:-Dockerfile}

      args:

        ALPINE_IMAGE_TAG:

        CURL_VERSION:

        BASH_VERSION:

        GLIBC_VERSION:

        AWS_CLI_VERSION:

        BACKUP_PATH:

    environment:

      BACKUP_PATH:

      PATHS_TO_BACKUP: