From 9b2b8cba6e56b8e66a2562bdc6bc5e4440230147 Mon Sep 17 00:00:00 2001 From: 0x1a8510f2 Date: Mon, 12 Sep 2022 15:09:13 +0100 Subject: [PATCH] Oops, `1.19-stretch` doesn't exist; use bullseye Turns out stretch is actually pretty outdated --- build/scripts/Complement.Dockerfile | 2 +- build/scripts/ComplementLocal.Dockerfile | 2 +- build/scripts/ComplementPostgres.Dockerfile | 2 +- cmd/dendrite-upgrade-tests/main.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/scripts/Complement.Dockerfile b/build/scripts/Complement.Dockerfile index 8485926f8..b635d7bea 100644 --- a/build/scripts/Complement.Dockerfile +++ b/build/scripts/Complement.Dockerfile @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.2 -FROM golang:1.19-stretch as build +FROM golang:1.19-bullseye as build RUN apt-get update && apt-get install -y sqlite3 WORKDIR /build diff --git a/build/scripts/ComplementLocal.Dockerfile b/build/scripts/ComplementLocal.Dockerfile index 7cb7168ef..d3cf71086 100644 --- a/build/scripts/ComplementLocal.Dockerfile +++ b/build/scripts/ComplementLocal.Dockerfile @@ -8,7 +8,7 @@ # # Use these mounts to make use of this dockerfile: # COMPLEMENT_HOST_MOUNTS='/your/local/dendrite:/dendrite:ro;/your/go/path:/go:ro' -FROM golang:1.19-stretch +FROM golang:1.19-bullseye RUN apt-get update && apt-get install -y sqlite3 ENV SERVER_NAME=localhost diff --git a/build/scripts/ComplementPostgres.Dockerfile b/build/scripts/ComplementPostgres.Dockerfile index d6ab62c6e..423899ea3 100644 --- a/build/scripts/ComplementPostgres.Dockerfile +++ b/build/scripts/ComplementPostgres.Dockerfile @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.2 -FROM golang:1.19-stretch as build +FROM golang:1.19-bullseye as build RUN apt-get update && apt-get install -y postgresql WORKDIR /build diff --git a/cmd/dendrite-upgrade-tests/main.go b/cmd/dendrite-upgrade-tests/main.go index 6b9be063a..998ade212 100644 --- a/cmd/dendrite-upgrade-tests/main.go +++ b/cmd/dendrite-upgrade-tests/main.go @@ -49,7 +49,7 @@ const HEAD = "HEAD" // due to the error: // When using COPY with more than one source file, the destination must be a directory and end with a / // We need to run a postgres anyway, so use the dockerfile associated with Complement instead. -const Dockerfile = `FROM golang:1.19-stretch as build +const Dockerfile = `FROM golang:1.19-bullseye as build RUN apt-get update && apt-get install -y postgresql WORKDIR /build