Skip to content

Commit 0a323b6

Browse files
committed
refactor: replace openstack with minio
1 parent 0d56315 commit 0a323b6

3 files changed

Lines changed: 40 additions & 24 deletions

File tree

.github/workflows/job-tests.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@ jobs:
4040
--health-retries 10
4141
ports:
4242
- 9200:9200
43-
localstack:
44-
image: localstack/localstack:latest
45-
env:
46-
LOCALSTACK_AUTH_TOKEN: ${{ secrets.LOCALSTACK_AUTH_TOKEN }}
47-
SERVICES: s3
48-
AWS_ACCESS_KEY_ID: test
49-
AWS_SECRET_ACCESS_KEY: test
50-
ports:
51-
- 4566:4566
52-
- 4571:4571
5343
strategy:
5444
fail-fast: false
5545
matrix:
@@ -81,6 +71,18 @@ jobs:
8171
sleep 2
8272
done
8373
74+
- name: "Start MinIO and create bucket"
75+
run: |
76+
docker run -d --name minio -p 9000:9000 \
77+
-e MINIO_ROOT_USER=minioadmin \
78+
-e MINIO_ROOT_PASSWORD=minioadmin \
79+
quay.io/minio/minio:latest server /data
80+
timeout 30 sh -c 'until curl -fs http://localhost:9000/minio/health/live > /dev/null; do sleep 1; done'
81+
docker run --rm --network=host --entrypoint sh quay.io/minio/mc:latest -c "
82+
mc alias set local http://localhost:9000 minioadmin minioadmin &&
83+
mc mb local/flowphpbucket01 --ignore-existing
84+
"
85+
8486
- name: "Setup PHP Environment"
8587
uses: "./.github/actions/setup-php-env"
8688
with:
@@ -127,10 +129,10 @@ jobs:
127129
AZURITE_BLOB_PORT: "10000"
128130
AZURITE_ACCOUNT_NAME: "flowphpaccount01"
129131
AZURITE_ACCOUNT_KEY: "flowphpkey01"
130-
S3_ENDPOINT: "http://localhost:${{ job.services.localstack.ports[4566] }}"
132+
S3_ENDPOINT: "http://localhost:9000"
131133
S3_REGION: "us-east-1"
132-
S3_ACCESS_KEY_ID: "test"
133-
S3_SECRET_ACCESS_KEY: "test"
134+
S3_ACCESS_KEY_ID: "minioadmin"
135+
S3_SECRET_ACCESS_KEY: "minioadmin"
134136
OTEL_RECEIVER_HTTP_ENDPOINT: "http://localhost:4318"
135137
OTEL_RECEIVER_GRPC_ENDPOINT: "localhost:4317"
136138
OTEL_COLLECTOR_METRICS_ENDPOINT: "http://localhost:8888/metrics"

compose.yml.dist

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,31 @@ services:
5959
- "6379:6379"
6060
networks:
6161
- flow-php
62-
localstack:
63-
image: localstack/localstack:latest
64-
container_name: flow-php-localstack
62+
minio:
63+
image: minio/minio:latest
64+
container_name: flow-php-minio
65+
command: server /data --console-address ":9001"
6566
ports:
66-
- "4566:4566"
67+
- "9000:9000"
68+
- "9001:9001"
6769
environment:
68-
- SERVICES=s3
69-
- DEBUG=1
70-
- DATA_DIR=/var/localstack/data
70+
- MINIO_ROOT_USER=minioadmin
71+
- MINIO_ROOT_PASSWORD=minioadmin
7172
volumes:
72-
- "./var/localstack:/var/localstack"
73+
- "./var/minio:/data"
74+
networks:
75+
- flow-php
76+
minio-init:
77+
image: minio/mc
78+
container_name: flow-php-minio-init
79+
depends_on:
80+
- minio
81+
entrypoint: >
82+
/bin/sh -c "
83+
until mc alias set flow http://minio:9000 minioadmin minioadmin; do sleep 1; done;
84+
mc mb flow/flowphpbucket01 --ignore-existing;
85+
exit 0;
86+
"
7387
networks:
7488
- flow-php
7589
aspire:

phpunit.xml.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<env name="AZURITE_BLOB_PORT" value="10000"/>
1414
<env name="AZURITE_ACCOUNT_NAME" value="flowphpaccount01"/>
1515
<env name="AZURITE_ACCOUNT_KEY" value="flowphpkey01"/>
16-
<env name="S3_ENDPOINT" value="http://localhost:4566"/>
16+
<env name="S3_ENDPOINT" value="http://localhost:9000"/>
1717
<env name="S3_REGION" value="us-east-1"/>
18-
<env name="S3_ACCESS_KEY_ID" value="test"/>
19-
<env name="S3_SECRET_ACCESS_KEY" value="test"/>
18+
<env name="S3_ACCESS_KEY_ID" value="minioadmin"/>
19+
<env name="S3_SECRET_ACCESS_KEY" value="minioadmin"/>
2020
<env name="S3_BUCKET" value="flowphpbucket01"/>
2121
<env name="REDIS_HOST" value="localhost"/>
2222
<env name="REDIS_PORT" value="6379"/>

0 commit comments

Comments
 (0)