From 7d43f4ceeed40b90c33e3f2ffdc11d03eb3f1719 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Tue, 20 Jun 2023 15:08:15 -0500 Subject: [PATCH] chore: update dogfood image (#8114) --- dogfood/Dockerfile | 3 ++- dogfood/files/etc/apt/sources.list | 6 +++--- provisionerd/proto/provisionerd.pb.go | 2 +- provisionersdk/proto/provisioner.pb.go | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 4bb0e45088..d25a0c3b37 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -78,7 +78,7 @@ 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 FROM ubuntu:jammy @@ -320,6 +320,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 0285faf24f..745bcefcf2 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 diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 14b6ba32a1..d7db84d698 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 43a86339f1..860d282cca 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