Skip to content

Commit

Permalink
all(test): Update storj-up to v1.2.7
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ifraixedes committed May 30, 2024
1 parent 83c0f46 commit fd7d3af
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 520 deletions.
18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,39 @@ test:

.PHONY: clean
clean: integration-tests-env-down
rm -rf .tmp
$(MAKE) -C uplink-sys clean
$(MAKE) -C uplink clean


.PHONY: integration-tests-env-up
integration-tests-env-up:
docker compose up -d
integration-tests-env-up: .tmp/up/docker-compose.yaml
cd .tmp/up; docker compose up -d
$(MAKE) .tmp/env

.PHONY: integration-tests-env-down
integration-tests-env-down:
docker compose down
@if [ -f .tmp/up/docker-compose.yaml ]; then cd .tmp/up; docker compose down; fi
rm -rf .tmp

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

.tmp/up/storj-up: .tmp/up
cd .tmp/up; go build -tags noquic -o storj-up
cd .tmp/up; ./storj-up init minimal,edge,db

.tmp/up:
mkdir -p .tmp
cd .tmp; git clone https://github.com/storj/up.git
cd .tmp/up; git checkout v1.2.3
cd .tmp/up; git checkout v1.2.7

.tmp/up/docker-compose.yaml: .tmp/up/storj-up
Loading

0 comments on commit fd7d3af

Please sign in to comment.