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

update to new localstack image

Browse source
This commit is contained in:
Robin Appelman 2021-04-08 16:20:27 +02:00
commit df186df3c3
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
images/haze/configs/s3.php
View file

@ -7,7 +7,7 @@
'key' => 'dummy', 'key' => 'dummy',
'secret' => 'dummyj', 'secret' => 'dummyj',
'hostname' => 's3', 'hostname' => 's3',
'port' => 4569, 'port' => 4566,
'use_ssl' => false, 'use_ssl' => false,
'use_path_style'=>true 'use_path_style'=>true
], ],

6
images/haze/configs/s3cfg
View file

@ -1,6 +1,6 @@
[default] [default]
access_key = DUMMY access_key = DUMMY
secret_key = DUMMY secret_key = DUMMY
host_base = http://s3:4569/ host_base = http://s3:4566/
host_bucket = http://s3:4569/%(bucket) host_bucket = http://s3:4566/%(bucket)
no_ssl = True check_ssl_certificate = False

8
src/service.rs
View file

@ -71,7 +71,7 @@ pub enum ObjectStore {
impl ObjectStore { impl ObjectStore {
fn image(&self) -> &str { fn image(&self) -> &str {
match self { match self {
ObjectStore::S3 => "localstack/localstack:0.10.9", ObjectStore::S3 => "localstack/localstack:0.12.7",
} }
} }
@ -83,7 +83,7 @@ impl ObjectStore {
fn self_env(&self) -> Vec<&str> { fn self_env(&self) -> Vec<&str> {
match self { match self {
ObjectStore::S3 => vec!["DEBUG=1", "SERVICES=s3:4569"], ObjectStore::S3 => vec!["DEBUG=1", "SERVICES=s3"],
} }
} }
@ -130,13 +130,13 @@ impl ObjectStore {
docker, docker,
format!("{}-object", cloud_id), format!("{}-object", cloud_id),
"root", "root",
vec!["curl", "localhost:4569/"], vec!["curl", "localhost:4566/health"],
vec![], vec![],
Some(&mut output), Some(&mut output),
) )
.await?; .await?;
let output = String::from_utf8(output)?; let output = String::from_utf8(output)?;
Ok(output.contains("ListAllMyBucketsResult")) Ok(output.contains(r#""s3": "running""#))
} }
fn container_name(&self, cloud_id: &str) -> String { fn container_name(&self, cloud_id: &str) -> String {