Commit a59e60d0 authored by Jacob Priddy's avatar Jacob Priddy 👌

modern problems require modern solutions

parent 12df0695
Pipeline #693 passed with stages
in 1 minute and 40 seconds
......@@ -15,7 +15,7 @@ build_web_backend:
stage: build
script:
- cd src/web
- ./install-dev.sh gitlab
- ./install-dev.sh
artifacts:
paths:
- src/web/backend/vendor
......
......@@ -17,9 +17,9 @@ services:
- ./nginx/conf.d/:/etc/nginx/conf.d/
networks:
- doorcode
db:
postgres:
image: postgres:12-alpine
container_name: db
container_name: postgres
restart: unless-stopped
tty: true
ports:
......@@ -38,7 +38,7 @@ services:
ports:
- "8081:80"
environment:
PHP_PG_ADMIN_SERVER_HOST: db
PHP_PG_ADMIN_SERVER_HOST: postgres
PHP_PG_ADMIN_SERVER_DEFAULT_DB: doorcode
networks:
- doorcode
......
......@@ -5,7 +5,7 @@ APP_DEBUG=true
APP_URL=http://localhost
DB_CONNECTION=pgsql
DB_HOST=db
DB_HOST=postgres
DB_PORT=5432
DB_DATABASE=doorcode
DB_USERNAME=web
......
#!/bin/bash
if [ $# -eq 0 ]
then
cp .env.example .env
else
cp .env.gitlab .env
fi
cp .env.example .env
php artisan clear-compiled
php artisan cache:clear
......
......@@ -5,10 +5,5 @@ composer install -d backend
# configure the backend
cd backend || exit
if [ $# -eq 0 ]
then
./configure.sh
else
./configure.sh "$1"
fi
./configure.sh
Markdown is supported
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