Skip to content

Commit

Permalink
Revert "Switch minio to port 9500"
Browse files Browse the repository at this point in the history
This reverts commit 581d82e.
  • Loading branch information
rowanseymour committed Dec 5, 2024
1 parent 481452e commit 8d8a0e4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ jobs:
minio:
image: bitnami/minio:latest
env:
MINIO_API_PORT_NUMBER: 9500
MINIO_ROOT_USER: root
MINIO_ROOT_PASSWORD: tembatemba
MINIO_DEFAULT_BUCKETS: test-default,test-attachments:public,test-sessions,test-logs,test-archives
ports:
- 9500:9500
- 9000:9000
options: --health-cmd "mc ready local" --health-interval 10s --health-timeout 5s --health-retries 5

steps:
Expand Down
2 changes: 1 addition & 1 deletion temba/archives/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def test_read(self):
archive = self.create_archive(Archive.TYPE_MSG, "D", date(2020, 7, 31), [{"id": 1}, {"id": 2}])

download_url = (
f"http://localhost:9500/test-archives/{self.org.id}/message_D20200731_{archive.hash}.jsonl.gz?response-con"
f"http://localhost:9000/test-archives/{self.org.id}/message_D20200731_{archive.hash}.jsonl.gz?response-con"
f"tent-disposition=attachment%3B&response-content-type=application%2Foctet&response-content-encoding=none"
)

Expand Down
2 changes: 1 addition & 1 deletion temba/flows/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4834,7 +4834,7 @@ def test_session_json(self):
Bucket="test-sessions", Key="c/session.json", Body=io.BytesIO(json.dumps(session.output).encode())
)
FlowSession.objects.filter(id=session.id).update(
output_url="http://minio:9500/test-sessions/c/session.json", output=None
output_url="http://minio:9000/test-sessions/c/session.json", output=None
)

# fetch our contact history
Expand Down
2 changes: 1 addition & 1 deletion temba/settings_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@

# settings used by django-storages (defaults to local Minio server)
AWS_S3_REGION_NAME = AWS_REGION
AWS_S3_ENDPOINT_URL = f"http://{_minio_host}:9500"
AWS_S3_ENDPOINT_URL = f"http://{_minio_host}:9000"
AWS_S3_ADDRESSING_STYLE = "path"
AWS_S3_FILE_OVERWRITE = False

Expand Down

0 comments on commit 8d8a0e4

Please sign in to comment.