Skip to content
Snippets Groups Projects
Commit 2942f702 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !25
parents fd6d7462 10655929
No related branches found
No related tags found
1 merge request!25Merging develop into main
Pipeline #526406 passed
dev: dev:
root: '/var/www/html/{{ webRoot }}/' root: '/var/www/html/{{ webRoot }}/'
uri: '{{ projectdomain }}{{ projectport }}' uri: '{{ projectdomain }}{{ projectport }}'
docker:
service: php
compose:
options: --project-name {{ projectname }} --file docker-compose.yml --project-directory {{ projectroot }}
behat: behat:
root: '/var/www/html/{{ webRoot }}/' root: '/var/www/html/{{ webRoot }}/'
uri: '{{ webserver.type }}' uri: '{{ webserver.type }}'
docker:
service: php
compose:
options: --project-name {{ projectname }} --file docker-compose.yml --project-directory {{ projectroot }}
live: live:
root: '{{ live.root }}' root: '{{ live.root }}'
uri: '{{ live.uri }}' uri: '{{ live.uri }}'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment