Commit ca6fd79d authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'dz-add-packages-object-storage' into 'master'

Add object storage support for packages into GDK

See merge request gitlab-org/gitlab-development-kit!526
parents 387d0312 43ec915e
......@@ -516,7 +516,7 @@ elasticsearch-${elasticsearch_version}.tar.gz:
echo "${elasticsearch_tar_gz_sha1} $@.tmp" | shasum -a1 -c -
mv $@.tmp $@
object-storage-setup: minio/data/lfs-objects minio/data/artifacts minio/data/uploads
object-storage-setup: minio/data/lfs-objects minio/data/artifacts minio/data/uploads minio/data/packages
minio/data/%:
mkdir -p $@
......
......@@ -131,6 +131,36 @@ c
path_style: true
.
1
/^ packages:/
/^ enabled:/
c
enabled: true
.
/^ object_store:/
/^ enabled:/
c
enabled: ${object_store_enabled:=false}
.
/^ remote_directory:/
c
remote_directory: packages
.
/^ connection:/
/^ aws_access_key_id:/
c
aws_access_key_id: minio
.
/^ aws_secret_access_key:/
c
aws_secret_access_key: gdk-minio
.
/^ region:/
c
region: gdk
endpoint: 'http://127.0.0.1:${object_store_port:-9000}'
path_style: true
.
1
/^ pages:/
/^ enabled:/
c
......
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