diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 852b1b301879c4bd5afc8127f22d6fe4778c9795..894aa4092a93ff30d808f30d1e1231150aa786df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,16 +2,34 @@ stages: - build - deploy -build: +build_development: + stage: build + only: + - master + script: + - docker-compose -f docker-compose-development.yml build + +deploy_development: + stage: deploy + only: + - master + script: + - docker-compose -f docker-compose-development.yml up -d + environment: + name: development + +build_staging: stage: build only: - staging script: - docker-compose -f docker-compose-staging.yml build -deploy: +deploy_staging: stage: deploy only: - staging script: - docker-compose -f docker-compose-staging.yml up -d + environment: + name: staging diff --git a/docker-compose-development.yml b/docker-compose-development.yml new file mode 100644 index 0000000000000000000000000000000000000000..c7628bc2a9d7efdbb709553ee931b52eaf97c1d2 --- /dev/null +++ b/docker-compose-development.yml @@ -0,0 +1,11 @@ +version: "2" + +services: + nginx-app: + build: + context: ./ + volumes: + - ./nginx.conf:/etc/nginx/conf.d/default.conf + ports: + - 8081:8080 + \ No newline at end of file diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml index 22482ced23bfcf5da137333202570d434d68e517..73cbe80de80869416cb95686e54d6d8c4a505959 100644 --- a/docker-compose-staging.yml +++ b/docker-compose-staging.yml @@ -5,7 +5,7 @@ services: build: context: ./ volumes: - - ./webapp-nginx.conf:/etc/nginx/conf.d/default.conf + - ./nginx.conf:/etc/nginx/conf.d/default.conf ports: - 8080:8080 \ No newline at end of file diff --git a/webapp-nginx.conf b/nginx.conf similarity index 100% rename from webapp-nginx.conf rename to nginx.conf