Commit 8c592229 authored by Ignacio's avatar Ignacio
Browse files

Separa var. de cron en varias variables 

Corrige el paso de expresión de cron en la variable
de mantenimiento
parent 48d0a9d2

.gitlab-ci.yml

+6 −2
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ variables: 
    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} INTERVAL=${INTERVAL}

      MAINTENANCE_INTERVAL="${MAINTENANCE_INTERVAL}" RETENTION_TIME="${RETENTION_TIME}"

      MAINTENANCE_INTERVAL_MINUTE="${MAINTENANCE_INTERVAL_MINUTE}" MAINTENANCE_INTERVAL_HOUR="${MAINTENANCE_INTERVAL_HOUR}"

      MAINTENANCE_INTERVAL_DAY_OF_MONTH="${MAINTENANCE_INTERVAL_DAY_OF_MONTH}" MAINTENANCE_INTERVAL_MONTH="${MAINTENANCE_INTERVAL_MONTH}"

      MAINTENANCE_INTERVAL_DAY_OF_WEEK="${MAINTENANCE_INTERVAL_DAY_OF_WEEK}" RETENTION_TIME="${RETENTION_TIME}"

  environment:

    name: dev/${CI_PROJECT_NAME}
@@ -36,7 +38,9 @@ variables: 
    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} INTERVAL=${INTERVAL}

      MAINTENANCE_INTERVAL="${MAINTENANCE_INTERVAL}" RETENTION_TIME="${RETENTION_TIME}"

      MAINTENANCE_INTERVAL_MINUTE="${MAINTENANCE_INTERVAL_MINUTE}" MAINTENANCE_INTERVAL_HOUR="${MAINTENANCE_INTERVAL_HOUR}"

      MAINTENANCE_INTERVAL_DAY_OF_MONTH="${MAINTENANCE_INTERVAL_DAY_OF_MONTH}" MAINTENANCE_INTERVAL_MONTH="${MAINTENANCE_INTERVAL_MONTH}"

      MAINTENANCE_INTERVAL_DAY_OF_WEEK="${MAINTENANCE_INTERVAL_DAY_OF_WEEK}" RETENTION_TIME="${RETENTION_TIME}"

      AWS_REGION=${AWS_REGION}

  environment:

    name: pro/${CI_PROJECT_NAME}

Dockerfile

+1 −4
Original line number Diff line number Diff line
@@ -3,10 +3,7 @@ FROM mdillon/postgis:11-alpine 
LABEL maintainer="info@redmic.es"



ENV PG_CRON_VERSION="1.1.4" \

	PG_PARTMAN_VERSION="4.0.0" \

	INTERVAL="hourly" \

	MAINTENANCE_INTERVAL="30 * * * *" \

	RETENTION_TIME="7 days"

	PG_PARTMAN_VERSION="4.0.0"



RUN apk add --no-cache --virtual \

		.build-deps \

deploy/docker-compose.postgresql.tmpl.yml

+5 −1
Original line number Diff line number Diff line
@@ -9,7 +9,11 @@ services: 
      - POSTGRES_USER

      - PGDATA

      - INTERVAL

      - MAINTENANCE_INTERVAL

      - MAINTENANCE_INTERVAL_MINUTE

      - MAINTENANCE_INTERVAL_HOUR

      - MAINTENANCE_INTERVAL_DAY_OF_MONTH

      - MAINTENANCE_INTERVAL_MONTH

      - MAINTENANCE_INTERVAL_DAY_OF_WEEK

      - RETENTION_TIME

    networks:

      postgres-vessel-net:

rootfs/docker-entrypoint-initdb.d/vessel.sh

+11 −1
Original line number Diff line number Diff line
@@ -2,6 +2,16 @@ 


set -e



INTERVAL=${INTERVAL:-hourly}

MAINTENANCE_INTERVAL_MINUTE=${MAINTENANCE_INTERVAL_MINUTE:-30}

MAINTENANCE_INTERVAL_HOUR=${MAINTENANCE_INTERVAL_HOUR:-*}

MAINTENANCE_INTERVAL_DAY_OF_MONTH=${MAINTENANCE_INTERVAL_DAY_OF_MONTH:-*}

MAINTENANCE_INTERVAL_MONTH=${MAINTENANCE_INTERVAL_MONTH:-*}

MAINTENANCE_INTERVAL_DAY_OF_WEEK=${MAINTENANCE_INTERVAL_DAY_OF_WEEK:-*}

RETENTION_TIME=${RETENTION_TIME:-7 days}



maintenanceInterval="$MAINTENANCE_INTERVAL_MINUTE $MAINTENANCE_INTERVAL_HOUR $MAINTENANCE_INTERVAL_DAY_OF_MONTH $MAINTENANCE_INTERVAL_MONTH $MAINTENANCE_INTERVAL_DAY_OF_WEEK"



psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL

	CREATE SCHEMA IF NOT EXISTS ais;
@@ -130,5 +140,5 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E 
	 retention = '${RETENTION_TIME}',

	 retention_keep_table = false;



	SELECT cron.schedule('${MAINTENANCE_INTERVAL}', \$\$CALL partman.run_maintenance_proc(p_analyze := false)\$\$);

	SELECT cron.schedule('${maintenanceInterval}', \$\$CALL partman.run_maintenance_proc(p_analyze := false)\$\$);

EOSQL
 
 No newline at end of file