Commit 45fc6863 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza detalles de imagen y mantenimiento

See merge request redmic-project/mqtt/vmq-redis-backup!12
parents 54920dc4 190637e8

.gitlab-ci.yml

+1 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ stages: 


variables:

  PROJECT_PARENT_NAME: mqtt

  DEVELOPMENT_MAINTENANCE_DISABLED: 'true'



.deploy:

  variables:
@@ -32,6 +33,3 @@ variables: 
  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICE: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}
 


scheduled-run-development:

  script: ':'

Dockerfile

+15 −5
Original line number Diff line number Diff line 
FROM alpine:3.9

ARG ALPINE_IMAGE_TAG=3.12.0



FROM alpine:${ALPINE_IMAGE_TAG}



LABEL maintainer="info@redmic.es"



ARG CURL_VERSION=7.69.1-r1

ARG REDIS_VERSION=5.0.9-r0

ARG PYTHON3_VERSION=3.8.5-r0

ARG PY3_PIP_VERSION=20.1.1-r0

ARG AWSCLI_VERSION=1.18.140



RUN apk --no-cache update && \

	apk --no-cache add \

		curl \

		redis \

		python3

		curl=${CURL_VERSION} \

		redis=${REDIS_VERSION} \

		python3=${PYTHON3_VERSION} \

		py3-pip=${PY3_PIP_VERSION}



RUN pip3 install --no-cache-dir --upgrade awscli

RUN pip install --no-cache-dir --upgrade \

	awscli==${AWSCLI_VERSION}



COPY script /

deploy/.env

+7 −0
Original line number Diff line number Diff line 
ALPINE_IMAGE_TAG=3.12.0

CURL_VERSION=7.69.1-r1

REDIS_VERSION=5.0.9-r0

PYTHON3_VERSION=3.8.5-r0

PY3_PIP_VERSION=20.1.1-r0

AWSCLI_VERSION=1.18.140



REDIS_HOST=vmq-redis

REDIS_PORT=6379

BACKUP_PATH=/tmp

deploy/docker-compose.tmpl.yml

+14 −2
Original line number Diff line number Diff line
@@ -3,6 +3,16 @@ version: '3.5' 
services:

  vmq-redis-backup:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/mqtt/vmq-redis-backup}:${IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        ALPINE_IMAGE_TAG:

        CURL_VERSION:

        REDIS_VERSION:

        PYTHON3_VERSION:

        PY3_PIP_VERSION:

        AWSCLI_VERSION:

    environment:

      REDIS_HOST:

      REDIS_PORT:
@@ -14,14 +24,16 @@ services: 
      PUSHGATEWAY_HOST:

      PUSHGATEWAY_JOB:

    networks:

      - vernemq-net

      - metric-net

      vernemq-net:

      metric-net:

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      restart_policy:

        condition: on-failure

        delay: ${RESTART_DELAY:-10s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'