Skip to content

Commit 42ac284

Browse files
committed
fix(test): s3 api error
1 parent f4269c6 commit 42ac284

4 files changed

Lines changed: 9 additions & 28 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV DRYCC_UID=1001 \
1515
DRYCC_GID=1001 \
1616
DRYCC_HOME_DIR=/var/lib/registry \
1717
JQ_VERSION="1.7.1" \
18-
MC_VERSION="2024.11.05.11.29.45" \
18+
MC_VERSION="2025.03.12.17.29.24" \
1919
REGISTRY_VERSION="2.8.3"
2020

2121
COPY rootfs/bin/ /bin/

contrib/ci/s3.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

contrib/ci/start-s3.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

contrib/ci/test.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22

33
set -eoxf pipefail
44

5-
BASE_DIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
65
DRYCC_STORAGE_ACCESSKEY=f4c4281665bc11ee8e0400163e04a9cd
76
DRYCC_STORAGE_SECRETKEY=f4c4281665bc11ee8e0400163e04a9cd
87

98

10-
STORAGE_JOB=$(podman run -d --entrypoint init-stack -p 8333:8333 \
11-
-v "${BASE_DIR}":/tmp/weed \
12-
-e DRYCC_STORAGE_ACCESSKEY="${DRYCC_STORAGE_ACCESSKEY}" \
13-
-e DRYCC_STORAGE_SECRETKEY="${DRYCC_STORAGE_SECRETKEY}" \
14-
"${DEV_REGISTRY}"/drycc/storage:canary /tmp/weed/start-s3.sh)
9+
STORAGE_JOB=$(podman run -d --entrypoint init-stack \
10+
-e MINIO_ROOT_USER="${DRYCC_STORAGE_ACCESSKEY}" \
11+
-e MINIO_ROOT_PASSWORD="${DRYCC_STORAGE_SECRETKEY}" \
12+
"${DEV_REGISTRY}"/drycc/storage:canary minio server /data)
1513

1614
# wait for port
1715
STORAGE_IP=$(podman inspect --format "{{ .NetworkSettings.IPAddress }}" "${STORAGE_JOB}")
18-
echo -e "\\033[32m---> Waitting for ${STORAGE_IP}:8333\\033[0m"
19-
wait-for-port --host="${STORAGE_IP}" 8333
20-
echo -e "\\033[32m---> S3 service ${STORAGE_IP}:8333 ready...\\033[0m"
16+
echo -e "\\033[32m---> Waitting for ${STORAGE_IP}:9000\\033[0m"
17+
wait-for-port --host="${STORAGE_IP}" 9000
18+
echo -e "\\033[32m---> S3 service ${STORAGE_IP}:9000 ready...\\033[0m"
2119
podman logs "${STORAGE_JOB}"
2220

2321
JOB=$(podman run -d \
@@ -27,7 +25,7 @@ JOB=$(podman run -d \
2725
-e DRYCC_REGISTRY_PASSWORD=admin \
2826
-e DRYCC_STORAGE_LOOKUP=path \
2927
-e DRYCC_STORAGE_BUCKET=registry \
30-
-e DRYCC_STORAGE_ENDPOINT="http://${STORAGE_IP}:8333" \
28+
-e DRYCC_STORAGE_ENDPOINT="http://${STORAGE_IP}:9000" \
3129
-e DRYCC_STORAGE_ACCESSKEY="${DRYCC_STORAGE_ACCESSKEY}" \
3230
-e DRYCC_STORAGE_SECRETKEY="${DRYCC_STORAGE_SECRETKEY}" \
3331
"$1")

0 commit comments

Comments
 (0)