Loading .gitlab-ci.yml +9 −7 Original line number Diff line number Diff line Loading @@ -60,7 +60,7 @@ container_scanning: paths: [gl-sast-container-report.json] deploy-postgresql-master-dev: deploy-postgresql-dev: stage: deploy image: redmic/docker-gitlab variables: Loading @@ -69,20 +69,21 @@ deploy-postgresql-master-dev: SERVICE: ${CI_PROJECT_NAME}-master IMAGE_NAME: ${CI_REGISTRY_IMAGE} IMAGE_TAG: ${CI_COMMIT_SHA} COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-master.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-master.dev.yml COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml services: - docker:dind script: - create-nets.sh postgres-net - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} environment: name: dev/${CI_PROJECT_NAME}-master name: dev only: - dev when: manual deploy-postgresql-slave-dev: deploy-postgresql-pro: stage: deploy image: redmic/docker-gitlab variables: Loading @@ -91,15 +92,16 @@ deploy-postgresql-slave-dev: SERVICE: ${CI_PROJECT_NAME}-slave IMAGE_NAME: ${CI_REGISTRY_IMAGE} IMAGE_TAG: ${CI_COMMIT_SHA} COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-slave.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-slave.dev.yml COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml services: - docker:dind script: - create-nets.sh postgres-net - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} environment: name: dev/${CI_PROJECT_NAME}-slave name: prod only: - dev - master when: manual docker-compose.postgresql-master.dev.yml→docker-compose.dev.yml +12 −0 Original line number Diff line number Diff line version: '3.5' services: postgresql-master: container_name: postgresql-master postgresql: container_name: postgresql restart: on-failure:3 ports: - 5432:5432 volumes: postgres-master-vol: name: postgres-master-vol postgres-vol: name: postgres-vol docker-compose.postgresql-slave.dev.ymldeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line version: '3.5' services: postgresql-slave: container_name: postgresql-slave restart: on-failure:3 ports: - 5432 volumes: postgres-slave-vol: name: postgres-slave-vol docker-compose.postgresql-slave.tmpl.ymldeleted 100644 → 0 +0 −17 Original line number Diff line number Diff line version: '3.5' services: postgresql-slave: image: ${IMAGE_NAME}:${IMAGE_TAG:-latest} environment: - POSTGRES_PASSWORD networks: postgres-net: aliases: - postgresql_slave volumes: - postgres-slave-vol:/var/lib/postgresql/data networks: postgres-net: external: true docker-compose.prod.yml 0 → 100644 +26 −0 Original line number Diff line number Diff line version: '3.5' services: postgresql: container_name: postgresql ports: - 5432 deploy: mode: replicated replicas: 1 placement: constraints: - node.role == worker restart_policy: condition: on-failure max_attempts: 3 volumes: postgres-vol: name: "postgres-vol" driver: "cloudstor:aws" driver_opts: backing: relocatable size: 25 ebstype: io1 iops: 100 Loading
.gitlab-ci.yml +9 −7 Original line number Diff line number Diff line Loading @@ -60,7 +60,7 @@ container_scanning: paths: [gl-sast-container-report.json] deploy-postgresql-master-dev: deploy-postgresql-dev: stage: deploy image: redmic/docker-gitlab variables: Loading @@ -69,20 +69,21 @@ deploy-postgresql-master-dev: SERVICE: ${CI_PROJECT_NAME}-master IMAGE_NAME: ${CI_REGISTRY_IMAGE} IMAGE_TAG: ${CI_COMMIT_SHA} COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-master.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-master.dev.yml COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml services: - docker:dind script: - create-nets.sh postgres-net - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} environment: name: dev/${CI_PROJECT_NAME}-master name: dev only: - dev when: manual deploy-postgresql-slave-dev: deploy-postgresql-pro: stage: deploy image: redmic/docker-gitlab variables: Loading @@ -91,15 +92,16 @@ deploy-postgresql-slave-dev: SERVICE: ${CI_PROJECT_NAME}-slave IMAGE_NAME: ${CI_REGISTRY_IMAGE} IMAGE_TAG: ${CI_COMMIT_SHA} COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-slave.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-slave.dev.yml COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml services: - docker:dind script: - create-nets.sh postgres-net - > deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} environment: name: dev/${CI_PROJECT_NAME}-slave name: prod only: - dev - master when: manual
docker-compose.postgresql-master.dev.yml→docker-compose.dev.yml +12 −0 Original line number Diff line number Diff line version: '3.5' services: postgresql-master: container_name: postgresql-master postgresql: container_name: postgresql restart: on-failure:3 ports: - 5432:5432 volumes: postgres-master-vol: name: postgres-master-vol postgres-vol: name: postgres-vol
docker-compose.postgresql-slave.dev.ymldeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line version: '3.5' services: postgresql-slave: container_name: postgresql-slave restart: on-failure:3 ports: - 5432 volumes: postgres-slave-vol: name: postgres-slave-vol
docker-compose.postgresql-slave.tmpl.ymldeleted 100644 → 0 +0 −17 Original line number Diff line number Diff line version: '3.5' services: postgresql-slave: image: ${IMAGE_NAME}:${IMAGE_TAG:-latest} environment: - POSTGRES_PASSWORD networks: postgres-net: aliases: - postgresql_slave volumes: - postgres-slave-vol:/var/lib/postgresql/data networks: postgres-net: external: true
docker-compose.prod.yml 0 → 100644 +26 −0 Original line number Diff line number Diff line version: '3.5' services: postgresql: container_name: postgresql ports: - 5432 deploy: mode: replicated replicas: 1 placement: constraints: - node.role == worker restart_policy: condition: on-failure max_attempts: 3 volumes: postgres-vol: name: "postgres-vol" driver: "cloudstor:aws" driver_opts: backing: relocatable size: 25 ebstype: io1 iops: 100