From ceada10c15e18f1a002884901a43ff8d9b24689e Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Thu, 14 Jul 2022 13:18:08 +0200
Subject: [PATCH] ci/cd and docker - deploy in sdc-dev
---
.gitlab-ci.yml | 3 +--
ldvspec/docker/docker-compose-dev-cd.yml | 10 +++-------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bb74581..d03d7786 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,9 +50,8 @@ docker-deploy-master-test:
- chmod 644 ~/.ssh/known_hosts
script:
## deploy the docker-compose file and use it to spin up the containers
- #- scp docker/docker-compose-dev-cd.yml sdc@sdc-dev.astron.nl:/docker_compose/ldvspec/docker-compose-dev-cd.yml
+ - scp docker/docker-compose-dev-cd.yml sdc@sdc-dev.astron.nl:/docker_compose/ldvspec/docker-compose-dev-cd.yml
- ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY"
- #- docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
- ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker-compose -p ldvspec -f /docker_compose/ldvspec/docker-compose-dev-cd.yml up -d"
- echo "Application deployed"
diff --git a/ldvspec/docker/docker-compose-dev-cd.yml b/ldvspec/docker/docker-compose-dev-cd.yml
index b61623b7..1c6875e6 100644
--- a/ldvspec/docker/docker-compose-dev-cd.yml
+++ b/ldvspec/docker/docker-compose-dev-cd.yml
@@ -11,15 +11,11 @@ services:
postgres-ldvspec:
image: postgres:14
container_name: postgres-ldvspec
- ports:
- - "5432:5432"
+ #ports:
+ # - "5432:5432"
networks:
- traefik_proxy
- ldv_network
- environment:
- POSTGRES_PASSWORD: "secret"
- POSTGRES_USER: "postgres"
- POSTGRES_DB: "ldv-spec-db"
env_file:
- $HOME/shared/ldvspec.env
volumes:
@@ -28,7 +24,7 @@ services:
ldvspec:
container_name: ldvspec
- image: git.astron.nl:5000/astron-sdc/ldvspec:latest
+ image: git.astron.nl:5000/astron-sdc/ldv-specification:latest
expose:
- "8000"
--
GitLab