diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74d4182b7678a85de298f66b41c9528774959b21..bf2f9ddf9440871e5b53884173a8712c3846047e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,55 +10,14 @@ test: - pip install -r requirements.txt - python manage.py test -build: - stage: build - image: docker:stable - services: - backend: - container_name: django_group_${GROUPID} - build: - context: backend/secfit/ - dockerfile: Dockerfile - args: - DJANGO_SUPERUSER_USERNAME: "${DJANGO_SUPERUSER_USERNAME}" - DJANGO_SUPERUSER_PASSWORD: "${DJANGO_SUPERUSER_PASSWORD}" - DJANGO_SUPERUSER_EMAIL: "${DJANGO_SUPERUSER_EMAIL}" - environment: - - GROUPID=${GROUPID} - networks: - backend_bridge: - ipv4_address: 10.${GROUPID}.0.4 - - application: - container_name: node_group_${GROUPID} - build: - context: frontend/ - dockerfile: Dockerfile - args: - GROUPID: ${GROUPID} - DOMAIN: ${DOMAIN} - URL_PREFIX: ${URL_PREFIX} - PORT_PREFIX: ${PORT_PREFIX} - networks: - backend_bridge: - ipv4_address: 10.${GROUPID}.0.5 - web: - container_name: nginx_group_${GROUPID} - build: - context: . - dockerfile: Dockerfile - ports: - - ${PORT_PREFIX}${GROUPID}:80 - environment: - - GROUPID=${GROUPID} - - PORT_PREFIX=${PORT_PREFIX} - networks: - backend_bridge: - ipv4_address: 10.${GROUPID}.0.6 +services: + - docker:dind +build: + image: docker script: - - docker build - + - apk add --no-cache docker-compose + - docker-compose up -d staging: diff --git a/heruko.yml b/heruko.yml index 8c7553f8a56e7987e6869cb6ec3b0609626f347a..ba1222743dc071aff014bea59922b933ece79145 100644 --- a/heruko.yml +++ b/heruko.yml @@ -2,4 +2,4 @@ build: docker: web: Dockerfile run: - web: gunicorn hello_django.wsgi:application --bind 0.0.0.0:$PORT \ No newline at end of file + web: \ No newline at end of file