diff --git a/.env.like b/.env.like index a9ffba2..b75a0e8 100644 --- a/.env.like +++ b/.env.like @@ -1,22 +1,21 @@ -CONTAINERS_NAME=rsrv -# The name of the image to use for the containers +# The prefix of the image to use for the containers +CONTAINERS_NAME=sst_postamates + +# The django container settings and enviroment DJANGO_PORT=8000 DEBUG=False -# The django container settings and enviroment -POSTGRES_DB=rsrv_db + +# The database container settings and enviroment +POSTGRES_DB=sst_postamates_db POSTGRES_HOST=db POSTGRES_PORT=5435 -POSTGRES_USER=rsrv_user -POSTGRES_PASSWORD=rsrv_pass +POSTGRES_USER=sst_postamates_user +POSTGRES_PASSWORD=sst_postamates_pass POSTGRES_VOLUME_PATH=./pg_data POSTGRES_HOST_AUTH_METHOD=trust -POSTGRES_VOLUME_BACKUP_PATH=./pg_dumps -# The database container settings and enviroment -MARTIN_PORT=3000 + # The martin container settings and enviroment -DOMAIN=social.ru.com -# The frontend and nginx container settings and enviroment -EMAIL_HOST_USER = 'noreply@spatiality.website' -EMAIL_HOST_PASSWORD = "spatialitypass321" -EMAIL_HOST = 'smtp.yandex.ru' -EMAIL_PORT = 587 \ No newline at end of file +MARTIN_PORT=3000 + +# Host domain name (maps in docker-compose to REACT_APP_DOMAIN_URL) +DOMAIN=postnet-dev.selftech.ru diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d9b60d..655a971 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,7 @@ build-job: - cd $CI_PROJECT_DIR - ssh $REMOTE_USER docker pull $IMAGE_NAME:$CI_COMMIT_SHORT_SHA - DOCKER_HOST="ssh://$REMOTE_USER" docker-compose -f $COMPOSE up -d + - DOCKER_HOST="ssh://$REMOTE_USER" docker-compose restart martin deploy-test-job: <<: *deploy-common