fix: run wget in quiet mode and adapt MAILDEV_URL based on environment
parent
fb5267a13b
commit
28fe03b861
|
@ -3,7 +3,7 @@ pipeline:
|
||||||
image: python
|
image: python
|
||||||
environment:
|
environment:
|
||||||
- DATABSE_URL=postgres://postgres:password@database:5432/postgres
|
- DATABSE_URL=postgres://postgres:password@database:5432/postgres
|
||||||
- EMAIL_URL=smtp://admin:password@localhost:10025
|
- EMAIL_URL=smtp://admin:password@smtp:10025
|
||||||
commands:
|
commands:
|
||||||
- pip install virtualenv
|
- pip install virtualenv
|
||||||
- make env
|
- make env
|
||||||
|
@ -31,5 +31,6 @@ services:
|
||||||
container_name: hostea-dash-maildev
|
container_name: hostea-dash-maildev
|
||||||
environment:
|
environment:
|
||||||
- MAILDEV_SMTP_PORT=10025
|
- MAILDEV_SMTP_PORT=10025
|
||||||
|
- MAILDEV_WEB_PORT=1080
|
||||||
- MAILDEV_INCOMING_USER=admin
|
- MAILDEV_INCOMING_USER=admin
|
||||||
- MAILDEV_INCOMING_PASS=password
|
- MAILDEV_INCOMING_PASS=password
|
||||||
|
|
|
@ -7,7 +7,8 @@ readonly SERVER_PID_FILE=./tmp/gitea.pid
|
||||||
|
|
||||||
readonly DASHBOARD_URL="http://localhost:8000"
|
readonly DASHBOARD_URL="http://localhost:8000"
|
||||||
readonly GITEA_URL="http://localhost:3000"
|
readonly GITEA_URL="http://localhost:3000"
|
||||||
readonly MAILDEV_URL="http://localhost:1080"
|
|
||||||
|
|
||||||
readonly DASHBOARD_OIDC_DISCOVERY_URL="$DASHBOARD_URL/o/.well-known/openid-configuration/"
|
readonly DASHBOARD_OIDC_DISCOVERY_URL="$DASHBOARD_URL/o/.well-known/openid-configuration/"
|
||||||
|
|
||||||
readonly DASHBOARD_ADMIN_USERNAME=root
|
readonly DASHBOARD_ADMIN_USERNAME=root
|
||||||
|
@ -30,6 +31,14 @@ readonly HOSTEA_CUSTOMER_USERNAME=batman
|
||||||
readonly HOSTEA_CUSTOMER_PASSWORD=supercomplicatedpassword
|
readonly HOSTEA_CUSTOMER_PASSWORD=supercomplicatedpassword
|
||||||
readonly HOSTEA_CUSTOMER_EMAIL="$HOSTEA_CUSTOMER_USERNAME@example.org"
|
readonly HOSTEA_CUSTOMER_EMAIL="$HOSTEA_CUSTOMER_USERNAME@example.org"
|
||||||
|
|
||||||
|
|
||||||
|
if [ -z ${CI+x} ];
|
||||||
|
then
|
||||||
|
MAILDEV_URL="http://localhost:1080"
|
||||||
|
else
|
||||||
|
MAILDEV_URL="http://smtp:1080"
|
||||||
|
fi
|
||||||
|
|
||||||
OIDC_CLIENT_ID=""
|
OIDC_CLIENT_ID=""
|
||||||
OIDC_CLIENT_SECRET=""
|
OIDC_CLIENT_SECRET=""
|
||||||
|
|
||||||
|
@ -138,7 +147,7 @@ gitea(){
|
||||||
|
|
||||||
if [ ! -e $BIN ];
|
if [ ! -e $BIN ];
|
||||||
then
|
then
|
||||||
wget --output-document=$BIN $SOURCE
|
wget --quiet --output-document=$BIN $SOURCE
|
||||||
chmod +x $BIN
|
chmod +x $BIN
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue