From 13b56c5678e0a0bb96f54efec2c5a080dd28156d Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sat, 6 Nov 2021 23:27:44 +0300 Subject: [PATCH] credintials --- .gitlab-ci.yml | 4 ++-- Sprint/settings.py | 2 +- docker-compose.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f17949c..e2c6593 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,13 +12,13 @@ build: tags: - main script: - - docker login -u mathwave -p Fuck0ffb1tch + - docker login -u mathwave -p $DOCKERHUB_PASSWORD - docker build -t mathwave/sprint-repo:sprint . - docker push mathwave/sprint-repo:sprint .deploy: script: - - docker login -u mathwave -p Fuck0ffb1tch + - docker login -u mathwave -p $DOCKERHUB_PASSWORD - docker pull mathwave/sprint-repo:sprint - docker-compose up -d diff --git a/Sprint/settings.py b/Sprint/settings.py index 1cb2fa7..cdda980 100644 --- a/Sprint/settings.py +++ b/Sprint/settings.py @@ -82,7 +82,7 @@ DATABASES = { "ENGINE": "django.db.backends.postgresql_psycopg2", "NAME": "sprint", "USER": "postgres", - "PASSWORD": "password", + "PASSWORD": os.getenv("DB_PASSWORD", "password"), "HOST": os.getenv("DB_HOST", "0.0.0.0"), "PORT": 5432, } diff --git a/docker-compose.yaml b/docker-compose.yaml index b69397e..054b524 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,7 +10,7 @@ services: dockerfile: dockerfiles/postgres/Dockerfile environment: POSTGRES_USER: postgres - POSTGRES_PASSWORD: password + POSTGRES_PASSWORD: $POSTGRES_PASSWORD POSTGRES_DB: sprint volumes: - /sprint-data/postgres-data:/var/lib/postgresql/data