pkg/files/docker: update build and app images

Change-Id: Ie66f103569c06832d06202c67ee50cb1273b96b2
storj · Sep 12, 2024 · 20617ef · 20617ef
1 parent 550b134
commit 20617ef
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/build.last b/build.last
@@ -1 +1 @@
-20231025-2
+20240911-1
diff --git a/pkg/files/docker/build.Dockerfile b/pkg/files/docker/build.Dockerfile
@@ -2,9 +2,10 @@
 FROM --platform=$TARGETPLATFORM ubuntu:22.04 as base
 ARG TARGETPLATFORM
 RUN apt-get update
-RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install curl && curl -sfL https://deb.nodesource.com/setup_16.x  | bash -
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install curl && curl -sfL https://deb.nodesource.com/setup_22.x  | bash -
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install git sudo nodejs make gcc brotli g++
-RUN echo ${TARGETPLATFORM} | sed 's/linux\///' | xargs -I PLATFORM curl --fail -L https://go.dev/dl/go1.20.10.linux-PLATFORM.tar.gz | tar -C /usr/local -xz && cp /usr/local/go/bin/go /usr/local/bin/go
+RUN echo ${TARGETPLATFORM} | sed 's/linux\///' | xargs -I PLATFORM curl --fail -L https://go.dev/dl/go1.22.7.linux-PLATFORM.tar.gz | tar -C /usr/local -xz && cp /usr/local/go/bin/go /usr/local/bin/go
+ENV GOROOT=/usr/local/go
 
 RUN useradd storj --uid 1000 -d /var/lib/storj && \
     mkdir -p /var/lib/storj/shared && \

diff --git a/pkg/files/docker/edge.Dockerfile b/pkg/files/docker/edge.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3
 ARG TYPE
 ARG SOURCE
-FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20231025-2 AS base
+FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20240911-1 AS base
 
 FROM base AS commit
 ARG BRANCH

diff --git a/pkg/files/docker/storj.Dockerfile b/pkg/files/docker/storj.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3
 ARG TYPE
 ARG SOURCE
-FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20231025-2  AS base
+FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20240911-1  AS base
 
 ARG SKIP_FRONTEND_BUILD
 

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:20231025-2 AS base
+FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20240911-1 AS base
 
 FROM base AS commit
 ARG BRANCH

diff --git a/pkg/recipe/db.yaml b/pkg/recipe/db.yaml
@@ -2,7 +2,7 @@ name: db
 description: Cockroach and redis required by other services.
 add:
   - name: cockroach
-    image: cockroachdb/cockroach
+    image: cockroachdb/cockroach:v24.2.1
     port:
       - name: cockroach
         description: Cockroach Postgres-compatible SQL port