From f876847d0b1ad4281438114c6b1d6b0a78ec3b6e Mon Sep 17 00:00:00 2001 From: dlamarmorgan Date: Thu, 23 May 2024 11:35:34 -0700 Subject: [PATCH] pkg/{files/docker,recipe}: update edge dockerfile and billing recipe Change-Id: Ib3dee056442efc0699308fac917f014c1325f0cf --- pkg/files/docker/edge.Dockerfile | 5 +---- pkg/recipe/billing.yaml | 2 +- test/edge/Earthfile | 1 - test/storjscan/Earthfile | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkg/files/docker/edge.Dockerfile b/pkg/files/docker/edge.Dockerfile index 2d52843..936876a 100644 --- a/pkg/files/docker/edge.Dockerfile +++ b/pkg/files/docker/edge.Dockerfile @@ -34,7 +34,4 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \ go install -race ./cmd/... FROM img.dev.storj.io/storjup/base:20240509-1 AS final -COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin -COPY --from=binaries /var/lib/storj/gateway-mt/pkg/linksharing/web /var/lib/storj/pkg/linksharing/web - - +COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin \ No newline at end of file diff --git a/pkg/recipe/billing.yaml b/pkg/recipe/billing.yaml index 7066ce6..f0a8657 100644 --- a/pkg/recipe/billing.yaml +++ b/pkg/recipe/billing.yaml @@ -4,7 +4,7 @@ add: - name: storjscan label: - storjscan - image: img.dev.storj.io/storjup/storjscan:1.0.5 + image: img.dev.storj.io/storjup/storjscan:1.0.5-1 command: - storjscan - run diff --git a/test/edge/Earthfile b/test/edge/Earthfile index 18bc492..d75eaa0 100644 --- a/test/edge/Earthfile +++ b/test/edge/Earthfile @@ -6,7 +6,6 @@ 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.104.5 && \ /go/storj-up/storj-up env set authservice STORJ_ENDPOINT=http://gateway-mt:9999 COPY . . WITH DOCKER --compose docker-compose.yaml diff --git a/test/storjscan/Earthfile b/test/storjscan/Earthfile index 19a593d..0861dce 100644 --- a/test/storjscan/Earthfile +++ b/test/storjscan/Earthfile @@ -9,8 +9,7 @@ test: /go/storj-up/storj-up env setenv satellite-core STORJ_PAYMENTS_BILLING_CONFIG_INTERVAL=5s && \ /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:1.0.5-1 + /go/storj-up/storj-up env setenv storjscan STORJ_TOKEN_PRICE_USE_TEST_PRICES=true COPY . . WITH DOCKER --compose docker-compose.yaml RUN docker compose exec -T -u 0 storjscan bash -c 'storj-up health --host cockroach -d 120' && \