Skip to content

Commit

Permalink
switch minio to creds jenkins expects #6783
Browse files Browse the repository at this point in the history
  • Loading branch information
pdurbin committed Dec 5, 2023
1 parent e51bc22 commit 8c9f124
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ services:
-Ddataverse.files.minio1.path-style-access=true
-Ddataverse.files.minio1.upload-redirect=false
-Ddataverse.files.minio1.download-redirect=false
-Ddataverse.files.minio1.access-key=minioadmin
-Ddataverse.files.minio1.secret-key=minioadmin
-Ddataverse.files.minio1.access-key=4cc355_k3y
-Ddataverse.files.minio1.secret-key=s3cr3t_4cc355_k35
ports:
- "8080:8080" # HTTP (Dataverse Application)
- "4848:4848" # HTTP (Payara Admin Console)
Expand Down Expand Up @@ -211,9 +211,8 @@ services:
volumes:
- minio_storage:/data
environment:
# these are the defaults but are here for clarity
MINIO_ROOT_USER: minioadmin
MINIO_ROOT_PASSWORD: minioadmin
MINIO_ROOT_USER: 4cc355_k3y
MINIO_ROOT_PASSWORD: s3cr3t_4cc355_k35
command: server /data

networks:
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/edu/harvard/iq/dataverse/api/S3AccessIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public static void setUp() {
.withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKeyLocalStack, secretKeyLocalStack)))
.withEndpointConfiguration(new EndpointConfiguration("s3.localhost.localstack.cloud:4566", Regions.US_EAST_2.getName())).build();

String accessKeyMinio = "minioadmin";
String secretKeyMinio = "minioadmin";
String accessKeyMinio = "4cc355_k3y";
String secretKeyMinio = "s3cr3t_4cc355_k35";
s3minio = AmazonS3ClientBuilder.standard()
// https://stackoverflow.com/questions/72205086/amazonss3client-throws-unknownhostexception-if-attempting-to-connect-to-a-local
.withPathStyleAccessEnabled(Boolean.TRUE)
Expand Down

0 comments on commit 8c9f124

Please sign in to comment.