From a8e590cd6f3ff05d74122a510899c52be2372503 Mon Sep 17 00:00:00 2001 From: Lachlan Robertson Date: Fri, 27 Sep 2024 16:58:40 +1000 Subject: [PATCH] [WiP] Update dockerfile with pending s12-protos changes --- .idea/.gitignore | 8 ++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/protoc-docker.iml | 9 +++++++++ .idea/vcs.xml | 6 ++++++ protoc-go/Dockerfile | 3 ++- protoc-go/version.txt | 2 +- 7 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/protoc-docker.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3d27a7c --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/protoc-docker.iml b/.idea/protoc-docker.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/protoc-docker.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/protoc-go/Dockerfile b/protoc-go/Dockerfile index ab19193..96fc89e 100644 --- a/protoc-go/Dockerfile +++ b/protoc-go/Dockerfile @@ -1,6 +1,7 @@ FROM golang:1.18.0-alpine as builder -ENV S12_PROTO_VERSION 1.31.0 +#TODO @sc-lachlanrobertson: This is a tempoary item so I can test whether anything works! +ENV S12_PROTO_VERSION v1.32.1-0.20240926061402-edb34dfc0939 ENV PROTOC_GEN_GO_VERSION 1.34.1 ENV PROTOC_GEN_DOC_VERSION 1.5.1 diff --git a/protoc-go/version.txt b/protoc-go/version.txt index 31f8fdf..732c061 100644 --- a/protoc-go/version.txt +++ b/protoc-go/version.txt @@ -1 +1 @@ -3.21.2 +3.22.1