From bc034454f64833d3b37122ac7b0339a8fdc094f0 Mon Sep 17 00:00:00 2001 From: Bastian Oppermann Date: Mon, 23 Sep 2024 16:23:27 +0200 Subject: [PATCH] fix go version in DevContainer and contibution guide (#2768) * Remove trailing whitespaces in contribution.md They make the pre-commit hook "trailing-whitespace" fail. * Correct Go version in DevContainer and Contibution guide --- .devcontainer/Dockerfile | 2 +- docs/docs/community/contribution.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 13c8e98e..3189ab66 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/vscode/devcontainers/go:1-1.21 +FROM mcr.microsoft.com/vscode/devcontainers/go:1-1.22 SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/docs/docs/community/contribution.md b/docs/docs/community/contribution.md index cb0b2846..a6e8674c 100644 --- a/docs/docs/community/contribution.md +++ b/docs/docs/community/contribution.md @@ -15,7 +15,7 @@ We suggest using [Visual Studio Code](https://code.visualstudio.com/docs/languag # Go version -This project is currently still using go 1.19. You can follow the installation guide for go [here.](https://go.dev/doc/install) And you can find go version 1.19 in the archived section [here.](https://go.dev/dl/) +This project is currently still using go 1.22. You can follow the installation guide for go [here.](https://go.dev/doc/install) And you can find go version 1.22 in the archived section [here.](https://go.dev/dl/) # Preparing your fork Clone your fork, create a feature branch and update the depedencies to get started. @@ -44,7 +44,7 @@ For starting oauth2-proxy locally open the debugging tab and create the `launch. "program": "${workspaceFolder}", "args": [ "--config", - // The following configuration contains settings for a locally deployed + // The following configuration contains settings for a locally deployed // upstream and dex as an idetity provider "contrib/local-environment/oauth2-proxy.cfg" ] @@ -57,7 +57,7 @@ For starting oauth2-proxy locally open the debugging tab and create the `launch. "program": "${workspaceFolder}", "args": [ "--config", - // The following configuration contains settings for a locally deployed + // The following configuration contains settings for a locally deployed // upstream and keycloak as an idetity provider "contrib/local-environment/oauth2-proxy-keycloak.cfg" ]