Commit 000ae4df authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Renombra variables, reordena Dockerfile

parent da0421f7

Dockerfile

+22 −19
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ FROM alpine:${ALPINE_IMAGE_TAG} 


LABEL maintainer="info@redmic.es"



ARG POSTGRES_PASS_FILE="/root/.pgpass" \

	POSTGRES_DUMP_PATH="/tmp/backup"



ENV POSTGRES_PORT="5432" \

	POSTGRES_PASS_FILE="/root/.pgpass" \

	POSTGRES_DUMP_PATH="/tmp/backup" \
@@ -16,9 +13,12 @@ ENV POSTGRES_PORT="5432" \ 


COPY scripts /



ARG CURL_VERSION=7.74.0-r1

ARG POSTGRESQL_CLIENT_VERSION=10.10-r0

ARG BASH_VERSION=5.1.0-r0

ARG POSTGRES_PASS_FILE="/root/.pgpass" \

	POSTGRES_DUMP_PATH="/tmp/backup" \

	CURL_VERSION=7.74.0-r1 \

	POSTGRESQL_CLIENT_VERSION=10.10-r0 \

	BASH_VERSION=5.1.0-r0



RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.7/main" >> /etc/apk/repositories && \

	apk update && \

	apk list \
@@ -30,18 +30,24 @@ RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.7/main" >> /etc/apk/repositor 
		postgresql-client=${POSTGRESQL_CLIENT_VERSION} \

		bash=${BASH_VERSION}



ARG GLIBC_VER=2.33-r0

ARG AWS_CLI_VERSION=2.0.30

ENV GLIBC_VER=${GLIBC_VER}

ENV AWS_CLI_VERSION=${AWS_CLI_VERSION}

ARG GLIBC_VERSION=2.33-r0 \

	AWS_CLI_VERSION=2.0.30



ENV GLIBC_VERSION=${GLIBC_VERSION} \

	AWS_CLI_VERSION=${AWS_CLI_VERSION}



# hadolint ignore=DL3018

RUN curl -sL https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \

	curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-${GLIBC_VER}.apk && \

	curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk && \

	curl -sL "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk" -o glibc.apk && \

	curl -sL "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk" -o glibc-bin.apk && \

	apk add --no-cache \

		glibc-${GLIBC_VER}.apk \

		glibc-bin-${GLIBC_VER}.apk && \

	curl -s "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip" && \

		glibc.apk \

		glibc-bin.apk && \

	rm -rf \

		glibc.apk && \

		glibc-bin.apk && \

		/var/cache/apk/* && \

	curl -s "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip" -o awscliv2.zip && \

	unzip awscliv2.zip && \

	./aws/install && \

	rm -rf \
@@ -49,9 +55,6 @@ RUN curl -sL https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/ 
		./aws \

		/usr/local/aws-cli/v2/*/dist/aws_completer \

		/usr/local/aws-cli/v2/*/dist/awscli/data/ac.index \

		/usr/local/aws-cli/v2/*/dist/awscli/examples && \

	rm glibc-${GLIBC_VER}.apk && \

	rm glibc-bin-${GLIBC_VER}.apk && \

	rm -rf /var/cache/apk/*

		/usr/local/aws-cli/v2/*/dist/awscli/examples



ENTRYPOINT ["/docker-entrypoint.sh"]

deploy/.env

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ POSTGRES_DUMP_PATH=/tmp/backup 
CURL_VERSION=7.74.0-r1

POSTGRESQL_CLIENT_VERSION=10.10-r0

BASH_VERSION=5.1.0-r0

GLIBC_VER=2.33-r0

GLIBC_VERSION=2.33-r0

AWS_CLI_VERSION=2.0.30



POSTGRES_HOSTNAME=changeme

deploy/docker-compose.tmpl.yml

+9 −9
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ version: '3.5' 


services:

  backup-db:

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

    image: ${BACKUP_DB_IMAGE_NAME:-registry.gitlab.com/redmic-project/postgres/backup-db}:${BACKUP_DB_IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}

      dockerfile: ${BACKUP_DB_DOCKERFILE:-Dockerfile}

      args:

        ALPINE_IMAGE_TAG:

        POSTGRES_PASS_FILE:
@@ -13,7 +13,7 @@ services: 
        CURL_VERSION:

        POSTGRESQL_CLIENT_VERSION:

        BASH_VERSION:

        GLIBC_VER:

        GLIBC_VERSION:

        AWS_CLI_VERSION:

    environment:

      POSTGRES_USER:
@@ -32,17 +32,17 @@ services: 
      metric-net:

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      replicas: ${BACKUP_DB_REPLICAS:-1}

      restart_policy:

        condition: on-failure

        delay: ${RESTART_DELAY:-30s}

        delay: ${BACKUP_DB_RESTART_DELAY:-30s}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

          cpus: '${BACKUP_DB_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${BACKUP_DB_RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-64M}

          cpus: '${BACKUP_DB_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${BACKUP_DB_RESOURCES_RESERVATIONS_MEMORY:-64M}



networks:

  postgres-net: