diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f15570a..e5c6320 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ build: script: - docker login -u mathwave -p $DOCKERHUB_PASSWORD - docker pull mathwave/sprint-repo:sprint - - docker-compose up -d + - docker-compose up -d --scale worker=2 deploy-dev: extends: @@ -35,6 +35,10 @@ deploy-dev: PORT: 80 SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" HOST: "77.246.159.65" + script: + - docker login -u mathwave -p $DOCKERHUB_PASSWORD + - docker pull mathwave/sprint-repo:sprint + - docker-compose up -d --scale worker=2 deploy-prod: extends: diff --git a/docker-compose.yaml b/docker-compose.yaml index 9a99246..4c5cac1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -55,7 +55,7 @@ services: restart: always image: mathwave/sprint-repo:sprint privileged: true - command: scripts/create_worker.sh + command: python manage.py receive environment: SOLUTIONS_ROOT_EXTERNAL: "${SOLUTIONS_ROOT_EXTERNAL}" HOST: $HOST diff --git a/scripts/create_worker.sh b/scripts/create_worker.sh deleted file mode 100755 index 9293e2f..0000000 --- a/scripts/create_worker.sh +++ /dev/null @@ -1,6 +0,0 @@ -apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python -python3 -m ensurepip -apk update && apk add postgresql-dev gcc python3-dev musl-dev jpeg-dev zlib-dev libjpeg -pip3 install --no-cache --upgrade pip setuptools -pip3 install -r requirements.txt -python3 manage.py receive \ No newline at end of file