pkg/recipe: update storj and edge images

Change-Id: I91ff24f2c141513e37ec9185f0e0d7d0b00fab04
storj · Mar 26, 2024 · 1ab65c1 · 1ab65c1
1 parent b59274b
commit 1ab65c1
Show file tree

Hide file tree

Showing 15 changed files with 382 additions and 383 deletions.
diff --git a/pkg/config/gen/go.mod b/pkg/config/gen/go.mod
diff --git a/pkg/config/gen/go.sum b/pkg/config/gen/go.sum
diff --git a/pkg/files/docker/storjscan.Dockerfile b/pkg/files/docker/storjscan.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3
 ARG TYPE
 ARG SOURCE
-FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20230627-1 AS base
+FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20231025-2 AS base
 
 FROM base AS commit
 ARG BRANCH
@@ -34,7 +34,7 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \
     go install ./cmd/...
 RUN go install github.com/elek/cethacea@main
 
-FROM img.dev.storj.io/storjup/base:20231012-1 AS final
+FROM img.dev.storj.io/storjup/base:20240228-1 AS final
 COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin
 
 
diff --git a/pkg/recipe/admin.yaml b/pkg/recipe/admin.yaml
@@ -5,7 +5,7 @@ add:
     label:
       - storj
       - core
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - satellite
       - run

diff --git a/pkg/recipe/billing.yaml b/pkg/recipe/billing.yaml
@@ -4,13 +4,12 @@ add:
   - name: storjscan
     label:
       - storjscan
-    image: img.dev.storj.io/storjup/storjscan:20231012
+    image: img.dev.storj.io/storjup/storjscan:1.0.5
     command:
       - storjscan
       - run
       - --database=cockroach://root@cockroach:26257/storjscan?sslmode=disable
-      - --tokens.endpoint=http://geth:8545
-      - --tokens.contract=0x1E119A589270646585b044db12098B1e456a88Af
+      - --tokens.endpoints=[{"URL":"http://geth:8545","Contract":"0x1E119A589270646585b044db12098B1e456a88Af","ChainID":"1337"}]
       - --token-price.interval=1m
       - --token-price.coinmarketcap-config.base-url=https://sandbox-api.coinmarketcap.com
       - --token-price.coinmarketcap-config.api-key=b54bcf4d-1bca-4e8e-9a24-22ff2c3d462c

diff --git a/pkg/recipe/core.yaml b/pkg/recipe/core.yaml
@@ -5,7 +5,7 @@ add:
     label:
       - storj
       - core
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - satellite
       - run

diff --git a/pkg/recipe/edge.yaml b/pkg/recipe/edge.yaml
@@ -5,7 +5,7 @@ add:
     label:
       - storj
       - edge
-    image: img.dev.storj.io/storjup/edge:1.68.0
+    image: img.dev.storj.io/storjup/edge:1.74.0
     command:
       - gateway-mt
       - run
@@ -25,7 +25,7 @@ add:
     label:
       - storj
       - edge
-    image: img.dev.storj.io/storjup/edge:1.68.0
+    image: img.dev.storj.io/storjup/edge:1.74.0
     command:
       - authservice
       - run
@@ -45,7 +45,7 @@ add:
     label:
       - storj
       - edge
-    image: img.dev.storj.io/storjup/edge:1.68.0
+    image: img.dev.storj.io/storjup/edge:1.74.0
     command:
       - linksharing
       - run

diff --git a/pkg/recipe/gc.yaml b/pkg/recipe/gc.yaml
@@ -5,7 +5,7 @@ add:
     label:
       - storj
       - core
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - satellite
       - run
@@ -29,7 +29,7 @@ add:
     label:
       - storj
       - core
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - satellite
       - run

diff --git a/pkg/recipe/minimal.yaml b/pkg/recipe/minimal.yaml
@@ -5,7 +5,7 @@ add:
     label:
       - storj
       - core
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - satellite
       - run
@@ -50,7 +50,7 @@ add:
       - storj
       - core
     instance: 10
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - storagenode
       - run

diff --git a/pkg/recipe/rangedloop.yaml b/pkg/recipe/rangedloop.yaml
@@ -5,7 +5,7 @@ add:
     label:
       - storj
       - core
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - satellite
       - run

diff --git a/pkg/recipe/repair.yaml b/pkg/recipe/repair.yaml
@@ -5,7 +5,7 @@ add:
     label:
       - storj
       - core
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - satellite
       - run

diff --git a/pkg/recipe/uplink.yaml b/pkg/recipe/uplink.yaml
@@ -2,7 +2,7 @@ name: uplink
 description: uplink service
 add:
   - name: uplink
-    image: img.dev.storj.io/storjup/storj:1.93.2
+    image: img.dev.storj.io/storjup/storj:1.100.4
     command:
       - tail
       - -F

diff --git a/test/edge/Earthfile b/test/edge/Earthfile
@@ -6,11 +6,11 @@ test:
     COPY ../../+build-app/storj-up .
     # setup test environment
     RUN /go/storj-up/storj-up init minimal,edge,db,uplink && \
-        /go/storj-up/storj-up image uplink img.dev.storj.io/storjup/storj:1.93.2 && \
+        /go/storj-up/storj-up image uplink img.dev.storj.io/storjup/storj:1.100.4 && \
         /go/storj-up/storj-up env set authservice STORJ_ENDPOINT=http://gateway-mt:9999
     COPY . .
     WITH DOCKER --compose docker-compose.yaml
         RUN docker compose exec -T -u 0 uplink bash -c 'storj-up health --host cockroach -d 120' && \
             docker compose exec -T -u 0 uplink bash -c 'storj-up credentials -s satellite-api:7777 -c satellite-api:10000 -a http://authservice:8888 -e --s3 >> ~/.bashrc' && \
             < basic_rclone.sh docker compose exec -T -u 0 uplink bash -i
-    END
+    END
diff --git a/test/storjscan/Earthfile b/test/storjscan/Earthfile
@@ -10,7 +10,7 @@ test:
         /go/storj-up/storj-up env setenv satellite-core STORJ_PAYMENTS_STORJSCAN_INTERVAL=5s && \
         /go/storj-up/storj-up env setenv satellite-core STORJ_PAYMENTS_STORJSCAN_CONFIRMATIONS=12 && \
         /go/storj-up/storj-up env setenv storjscan STORJ_TOKEN_PRICE_USE_TEST_PRICES=true && \
-        /go/storj-up/storj-up image storjscan img.dev.storj.io/storjup/storjscan:20231012
+        /go/storj-up/storj-up image storjscan img.dev.storj.io/storjup/storjscan:1.0.5
     COPY . .
     WITH DOCKER --compose docker-compose.yaml
         RUN docker compose exec -T -u 0 storjscan bash -c 'storj-up health --host cockroach -d 120' && \
@@ -20,4 +20,4 @@ test:
             docker compose cp TestToken.abi storjscan:/var/lib/storj/TestToken.abi && \
             docker compose cp TestToken.bin storjscan:/var/lib/storj/TestToken.bin && \
             < basic_storjscan.sh docker compose exec -T -u 0 storjscan bash -i
-    END
+    END
diff --git a/test/storjscan/basic_storjscan.sh b/test/storjscan/basic_storjscan.sh
@@ -19,7 +19,7 @@ curl -X POST 'http://satellite-api:10000/api/v0/payments/wallet' --header "Cooki
 ADDRESS=$(curl -X GET -s http://satellite-api:10000/api/v0/payments/wallet --header "Cookie: _tokenKey=$_tokenKey" | jq -r '.address')
 
 #ACCOUNT is defined with environment variables above
-for i in {1..15}; do cethacea token transfer 1000 "$ADDRESS"; done
+for i in {1..15}; do cethacea token transfer 1000 "$ADDRESS"; sleep 1; done
 storj-up health --host cockroach -t billing_transactions -n 6 -d 12
 
 RESPONSE=$(curl -X GET http://satellite-api:10000/api/v0/payments/wallet/payments --header "Cookie: _tokenKey=$_tokenKey")