From 4598103e23b00840bd5093383ec37d122c4960ae Mon Sep 17 00:00:00 2001 From: Thomas Maurer Date: Mon, 8 Jul 2024 11:34:47 +0200 Subject: [PATCH] Bump Go version everywhere (#76) * Bump Go version everywhere * Update devcontainer image --- .devcontainer/Dockerfile | 8 ++++---- .devcontainer/docker-compose.yml | 2 +- go.mod | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2caebac..d321574 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ ARG VARIANT=1 -FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT} +FROM mcr.microsoft.com/vscode/devcontainers/go:1-${VARIANT} # [Option] Install zsh ARG INSTALL_ZSH="true" @@ -22,11 +22,11 @@ RUN apt-get update \ && /bin/bash /tmp/library-scripts/docker-in-docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "${USERNAME}" "${USE_MOBY}" \ # Clean up && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/ - + VOLUME [ "/var/lib/docker" ] -# Setting the ENTRYPOINT to docker-init.sh will start up the Docker Engine -# inside the container "overrideCommand": false is set in devcontainer.json. +# Setting the ENTRYPOINT to docker-init.sh will start up the Docker Engine +# inside the container "overrideCommand": false is set in devcontainer.json. # The script will also execute CMD if you need to alter startup behaviors. ENTRYPOINT [ "/usr/local/share/docker-init.sh" ] CMD [ "sleep", "infinity" ] diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 87f3faa..5ccf0c3 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile args: - VARIANT: 1.21 + VARIANT: 1.22 privileged: true cap_add: diff --git a/go.mod b/go.mod index 2fab3ba..1ddc0b9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module tm-to-abrp -go 1.17 +go 1.22 require ( github.com/eclipse/paho.mqtt.golang v1.4.3