From 9aad5f350d12e830103e1a898d4ee0531c979bc5 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Tue, 20 Jun 2023 19:44:36 +0000 Subject: [PATCH 1/3] chore: update dogfood image Use https apt mirrors and properly copy the protobuf include folder. --- dogfood/Dockerfile | 4 +++- dogfood/files/etc/apt/sources.list | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index cf9b3a017b7e6..7bb54ee2ee20c 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -78,8 +78,9 @@ RUN mkdir --parents "$GOPATH" && \ FROM alpine:3.18 as proto WORKDIR /tmp RUN apk add curl unzip -RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v21.5/protoc-21.5-linux-x86_64.zip +RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protoc-23.3-linux-x86_64.zip RUN unzip protoc.zip +RUN ls -lah FROM ubuntu:jammy @@ -320,6 +321,7 @@ RUN update-alternatives --install /usr/local/bin/gofmt gofmt /usr/local/go/bin/g COPY --from=go /tmp/bin /usr/local/bin COPY --from=rust-utils /tmp/bin /usr/local/bin COPY --from=proto /tmp/bin /usr/local/bin +COPY --from=proto /tmp/include /usr/local/bin/include USER coder diff --git a/dogfood/files/etc/apt/sources.list b/dogfood/files/etc/apt/sources.list index 0285faf24f787..745bcefcf2b0c 100644 --- a/dogfood/files/etc/apt/sources.list +++ b/dogfood/files/etc/apt/sources.list @@ -1,3 +1,3 @@ -deb http://mirror.pit.teraswitch.com/ubuntu/ jammy main restricted universe -deb http://mirror.pit.teraswitch.com/ubuntu/ jammy-updates main restricted universe -deb http://mirror.pit.teraswitch.com/ubuntu/ jammy-backports main restricted universe +deb https://mirror.pit.teraswitch.com/ubuntu/ jammy main restricted universe +deb https://mirror.pit.teraswitch.com/ubuntu/ jammy-updates main restricted universe +deb https://mirror.pit.teraswitch.com/ubuntu/ jammy-backports main restricted universe From 9a936a37d4dee5ea30c110c8dc7e84285df0319b Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Tue, 20 Jun 2023 19:49:35 +0000 Subject: [PATCH 2/3] fixup! chore: update dogfood image --- provisionerd/proto/provisionerd.pb.go | 2 +- provisionersdk/proto/provisioner.pb.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 14b6ba32a1239..d7db84d69813e 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.30.0 -// protoc v3.21.5 +// protoc v4.23.3 // source: provisionerd/proto/provisionerd.proto package proto diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index 43a86339f123c..860d282ccac03 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.30.0 -// protoc v3.21.5 +// protoc v4.23.3 // source: provisionersdk/proto/provisioner.proto package proto From 4fa35068b602da3be4d2b31fc2af4fc270a95c14 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Tue, 20 Jun 2023 19:56:27 +0000 Subject: [PATCH 3/3] fixup! chore: update dogfood image --- dogfood/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 7bb54ee2ee20c..d007a943252d6 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -80,7 +80,6 @@ WORKDIR /tmp RUN apk add curl unzip RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protoc-23.3-linux-x86_64.zip RUN unzip protoc.zip -RUN ls -lah FROM ubuntu:jammy