Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

add S3 path style as environment variable and set it in CI config

Browse source
This commit is contained in:
Sonja Happ 2021-01-14 14:21:49 +01:00
parent 9426e289dc
commit 2f796ed120
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -24,7 +24,7 @@ variables:
AWS_SECRET_ACCESS_KEY: ${MINIO_ACCESS_SECRET} AWS_SECRET_ACCESS_KEY: ${MINIO_ACCESS_SECRET}
S3_BUCKET: villas-web S3_BUCKET: villas-web
S3_ENDPOINT: http://minio:9000 S3_ENDPOINT: http://minio:9000
S3_PATHSTYLE: 'true'
PORT: 4000 PORT: 4000
GO_IMAGE: golang:1.13-buster GO_IMAGE: golang:1.13-buster

39
configuration/config.go
View file

@ -96,25 +96,26 @@ func InitConfig() error {
} }
mappings := map[string]string{ mappings := map[string]string{
"DB_HOST": "db.host", "DB_HOST": "db.host",
"DB_NAME": "db.name", "DB_NAME": "db.name",
"DB_USER": "db.user", "DB_USER": "db.user",
"DB_PASS": "db.pass", "DB_PASS": "db.pass",
"DB_SSLMODE": "db.ssl", "DB_SSLMODE": "db.ssl",
"AMQP_HOST": "amqp.host", "AMQP_HOST": "amqp.host",
"AMQP_USER": "amqp.user", "AMQP_USER": "amqp.user",
"AMQP_PASS": "amqp.pass", "AMQP_PASS": "amqp.pass",
"BASE_HOST": "base.host", "BASE_HOST": "base.host",
"BASE_PATH": "base.path", "BASE_PATH": "base.path",
"MODE": "mode", "MODE": "mode",
"PORT": "port", "PORT": "port",
"ADMIN_USER": "admin.user", "ADMIN_USER": "admin.user",
"ADMIN_PASS": "admin.pass", "ADMIN_PASS": "admin.pass",
"ADMIN_MAIL": "admin.mail", "ADMIN_MAIL": "admin.mail",
"S3_BUCKET": "s3.bucket", "S3_BUCKET": "s3.bucket",
"S3_ENDPOINT": "s3.endpoint", "S3_ENDPOINT": "s3.endpoint",
"S3_REGION": "s3.region", "S3_REGION": "s3.region",
"S3_NOSSL": "s3.nossl", "S3_NOSSL": "s3.nossl",
"S3_PATHSTYLE": "s3.pathstyle",
} }
defaults := config.NewStatic(static) defaults := config.NewStatic(static)