Skip to content

Commit 2b178f0

Browse files
committed
Fix exit code from 'Aborting on container exit...' on down
1 parent 4178980 commit 2b178f0

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM alpine:3.16
22

33
WORKDIR /usr/local/src/s3fs
4-
COPY . .
54
COPY --from=docker /usr/libexec/docker/cli-plugins/docker-compose /usr/bin/docker-compose
65
COPY ./regression-run/test-multiple-versions/entrypoint.sh /entrypoint.sh
6+
COPY . .
77

88
ENTRYPOINT /entrypoint.sh
99

regression-run/test-multiple-versions/entrypoint.sh

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,28 @@ function cleanup()
55
{
66
exit_status=$?
77
echo "exit was $exit_status"
8-
docker-compose -f regression-run/docker-compose.yml down 2>&1|| true
9-
exit $exit_status
8+
docker-compose -f regression-run/docker-compose.yml down --timeout 600 || true
9+
exit "$exit_status"
1010
}
1111
trap cleanup EXIT
1212

13-
docker-compose -f regression-run/docker-compose.yml up -d --no-recreate s3fs-fake-s3
13+
docker-compose -f regression-run/docker-compose.yml up --build -d --no-recreate s3fs-fake-s3
1414

1515
for NODEJS_VERSION in $NODEJS_VERSIONS_TO_TEST_UNIT
1616
do
1717
export NODEJS_VERSION="${NODEJS_VERSION}"
18-
docker-compose -f regression-run/docker-compose.yml build s3fs-tests
18+
export NODE_ENV=production
19+
export TEST_COMMAND="npm run test"
1920
echo "======================Start unit testing nodejs version ${NODEJS_VERSION}============================="
20-
NODE_ENV=production \
21-
TEST_COMMAND="npm run test" \
22-
docker-compose -f regression-run/docker-compose.yml up s3fs-tests --no-recreate --exit-code-from s3fs-tests
21+
docker-compose -f regression-run/docker-compose.yml up --build s3fs-tests --no-recreate --exit-code-from s3fs-tests
2322
done
2423

2524

2625
for NODEJS_VERSION in $NODEJS_VERSIONS_TO_TEST_REGRESSION
2726
do
2827
export NODEJS_VERSION="${NODEJS_VERSION}"
29-
docker-compose -f regression-run/docker-compose.yml build s3fs-tests
28+
export NODE_ENV=production
29+
export TEST_COMMAND="npm run test-regression"
3030
echo "======================Start regression testing nodejs version ${NODEJS_VERSION}============================="
31-
NODE_ENV=production \
32-
TEST_COMMAND="npm run test-regression" \
33-
docker-compose -f regression-run/docker-compose.yml up s3fs-tests --no-recreate --exit-code-from s3fs-tests
31+
docker-compose -f regression-run/docker-compose.yml up --build s3fs-tests --no-recreate --exit-code-from s3fs-tests
3432
done

0 commit comments

Comments
 (0)