Skip to content

Commit 9f4663a

Browse files
committed
all(test): Update storj-up to v1.2.7
Update storj-up to v1.2.7 to use a more recent satellite and edge versions. This commit also removes the docker-compose.yaml file to always autogenerate through storj-up to not have to keep it manually in sync every time that storj-up is updated. Thanks to @dlamarmorgan for the help of bumping storj-up and the tip not to have to autogenerate the docker-compose.yaml file.
1 parent 8f65677 commit 9f4663a

File tree

3 files changed

+18
-520
lines changed

3 files changed

+18
-520
lines changed

Makefile

+10-8
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,39 @@ test:
2121

2222
.PHONY: clean
2323
clean: integration-tests-env-down
24-
rm -rf .tmp
2524
$(MAKE) -C uplink-sys clean
2625
$(MAKE) -C uplink clean
2726

2827

2928
.PHONY: integration-tests-env-up
30-
integration-tests-env-up:
31-
docker compose up -d
29+
integration-tests-env-up: .tmp/up/docker-compose.yaml
30+
cd .tmp/up; docker compose up -d
3231
$(MAKE) .tmp/env
3332

3433
.PHONY: integration-tests-env-down
3534
integration-tests-env-down:
36-
docker compose down
35+
@if [ -f .tmp/up/docker-compose.yaml ]; then cd .tmp/up; docker compose down; fi
3736
rm -rf .tmp
3837

3938
.tmp/env: .tmp/up/storj-up
40-
@.tmp/up/storj-up credentials -e | grep -Ei "^export .+" > .tmp/env
39+
@cd .tmp/up; ./storj-up credentials -p -e | grep -Ei "^export .+" > ../env
4140
# TODO: This is a hack to get the AWS_* and STORJ_GATEWAY variables without
4241
# overriding the access grants because those variable are only available using
4342
# the storj-up from inside of the container, however, we cannot use the access
4443
# grants because they use the docker compose service name in the URL rather
4544
# than localhost and then it doesn't resolve.
4645
# See: https://github.com/storj/up/issues/45#issuecomment-1288808260
47-
@docker compose exec -T satellite-api storj-up credentials --s3 -e \
46+
@cd .tmp/up; docker compose exec -T satellite-api storj-up credentials --s3 -e \
4847
-a http://authservice:8888 -s satellite-api:7777 -c satellite-api:10000 \
49-
| grep -E 'AWS|STORJ_GATEWAY' >> .tmp/env
48+
| grep -E 'AWS|STORJ_GATEWAY' >> ../env
5049

5150
.tmp/up/storj-up: .tmp/up
5251
cd .tmp/up; go build -tags noquic -o storj-up
52+
cd .tmp/up; ./storj-up init minimal,edge,db
5353

5454
.tmp/up:
5555
mkdir -p .tmp
5656
cd .tmp; git clone https://github.com/storj/up.git
57-
cd .tmp/up; git checkout v1.2.3
57+
cd .tmp/up; git checkout v1.2.7
58+
59+
.tmp/up/docker-compose.yaml: .tmp/up/storj-up

0 commit comments

Comments
 (0)