robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00
Code Issues Projects Releases Wiki Activity

add minio mc command, update minio

Browse source
This commit is contained in:
Robin Appelman 2024-07-22 21:30:28 +02:00
commit e8bc685974
4 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
images/build.sh
View file

@ -4,14 +4,14 @@ set -e
export DOCKER_BUILDKIT=1 export DOCKER_BUILDKIT=1
versions=("8.1" "8.2" "8.3") versions=("8.1")
for version in "${versions[@]}"; do #for version in "${versions[@]}"; do
echo "building haze-php-$version" # echo "building haze-php-$version"
docker build --build-arg PHP_VERSION=$version -t "icewind1991/haze-php:$version" -f "php/Dockerfile" php # docker build --build-arg PHP_VERSION=$version -t "icewind1991/haze-php:$version" -f "php/Dockerfile" php
echo "building haze-php-$version-dbg" # echo "building haze-php-$version-dbg"
docker build --build-arg BASE_IMAGE=icewind1991/php-dbg --build-arg PHP_VERSION=$version -t "icewind1991/haze-php:$version-dbg" -f "php/Dockerfile" php # docker build --build-arg BASE_IMAGE=icewind1991/php-dbg --build-arg PHP_VERSION=$version -t "icewind1991/haze-php:$version-dbg" -f "php/Dockerfile" php
done #done
for version in "${versions[@]}"; do for version in "${versions[@]}"; do
echo "building haze-$version" echo "building haze-$version"

3
images/haze/Dockerfile
View file

@ -43,6 +43,9 @@ RUN DEBIAN_FRONTEND=noninteractive ;\
apt-get update && \ apt-get update && \
apt-get install --assume-yes blackfire apt-get install --assume-yes blackfire
RUN curl https://dl.min.io/client/mc/release/linux-amd64/mc -o /usr/bin/mc && \
chmod +x /usr/bin/mc
ADD configs/autoconfig_mariadb.php configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/s3m.php configs/s3mb.php configs/swift.php configs/swiftv3.php configs/azure.php configs/config.php /root/ ADD configs/autoconfig_mariadb.php configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/s3m.php configs/s3mb.php configs/swift.php configs/swiftv3.php configs/azure.php configs/config.php /root/
ADD configs/nginx-app.conf /etc/nginx/ ADD configs/nginx-app.conf /etc/nginx/

3
src/service/objectstore.rs
View file

@ -22,7 +22,7 @@ impl ObjectStore {
fn image(&self) -> &str { fn image(&self) -> &str {
match self { match self {
ObjectStore::S3 | ObjectStore::S3m | ObjectStore::S3mb => { ObjectStore::S3 | ObjectStore::S3m | ObjectStore::S3mb => {
"minio/minio:RELEASE.2023-01-20T02-05-44Z.hotfix.b9b60d73d" "minio/minio:RELEASE.2024-07-16T23-46-41Z"
} }
ObjectStore::Azure => "arafato/azurite:2.6.5", ObjectStore::Azure => "arafato/azurite:2.6.5",
} }
@ -182,6 +182,7 @@ impl ServiceTrait for ObjectStore {
"occ files_external:config 1 use_path_style true".into(), "occ files_external:config 1 use_path_style true".into(),
"occ files_external:config 1 key minio".into(), "occ files_external:config 1 key minio".into(),
"occ files_external:config 1 secret minio123".into(), "occ files_external:config 1 secret minio123".into(),
"mc alias set s3 http://s3:9000 minio minio123".into(),
]) ])
} else { } else {
Ok(Vec::new()) Ok(Vec::new())

10
src/service/sharded.rs
View file

@ -70,11 +70,6 @@ impl ServiceTrait for Sharding {
) -> Result<HashMap<String, Value>> { ) -> Result<HashMap<String, Value>> {
let shard_config = json!({ let shard_config = json!({
"filecache": { "filecache": {
"table": "filecache",
"primary_key": "fileid",
"shard_key": "storage",
"companion_keys": ["file_id"],
"companion_tables": ["filecache_extended", "files_metadata"],
"shards": [ "shards": [
{ {
"dbname": "haze", "dbname": "haze",
@ -153,11 +148,6 @@ impl ServiceTrait for SingleShard {
) -> Result<HashMap<String, Value>> { ) -> Result<HashMap<String, Value>> {
let shard_config = json!({ let shard_config = json!({
"filecache": { "filecache": {
"table": "filecache",
"primary_key": "fileid",
"shard_key": "storage",
"companion_keys": ["file_id"],
"companion_tables": ["filecache_extended", "files_metadata"],
"shards": [ "shards": [
{ {
"dbname": "haze", "dbname": "haze",