Commit 666cf905 authored by Jacob Priddy's avatar Jacob Priddy 👌
Browse files

Merge branch '66-remove-src-web-folder' into 'master'

Resolve "Remove src/web folder"

Closes #66

See merge request !53
parents 2c57a38b 54238f07
Pipeline #9241 passed with stages
in 4 minutes and 7 seconds
......@@ -14,40 +14,40 @@ stages:
build_web_backend:
stage: build
script:
- src/web/backend/install-dev.sh
- src/backend/install-dev.sh
artifacts:
paths:
- src/web/backend/vendor
- src/web/backend/.env
- src/web/backend/composer.lock
- src/backend/vendor
- src/backend/.env
- src/backend/composer.lock
# Currently set to build timeout
expire_in: 1 hour
build_web_frontend:
stage: build
script:
- src/web/frontend/install-dev.sh
- src/frontend/install-dev.sh
test_php_styles:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --stop-on-violation --using-cache=no
test_web_backend_unit:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/phpunit --testsuite Unit
test_web_backend_feature:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/phpunit --testsuite Feature
test_web_backend_database:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/phpunit --testsuite Database
......@@ -36,7 +36,7 @@ RUN groupadd -g 1000 www && \
useradd -u 1000 -ms /bin/bash -g www www
# Copy existing application directory permissions
COPY --chown=www:www src/web ${WORKDIR}
COPY --chown=www:www src/ ${WORKDIR}
COPY php/dev.ini /usr/local/etc/php/conf.d/local.ini
# Change current user to www
......
......@@ -28,7 +28,7 @@ services:
ports:
- "8080:443"
volumes:
- ./src/web:/var/www
- ./src:/var/www
- ./nginx/conf.d/:/etc/nginx/conf.d
- ./nginx/dhparam/:/run/dhparam
# Saml config
......@@ -78,7 +78,7 @@ services:
dockerfile: Dockerfile
container_name: api
volumes:
- ./src/web:/var/www
- ./src:/var/www
- ./php/dev.ini:/usr/local/etc/php/conf.d/local.ini
# Map saml files to the php-fpm server so it has access to them as well
- ./simplesamlphp-1.18.5:/var/simplesamlphp
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment