diff --git a/bin/aliases b/bin/aliases index 0cef1dc718..92f1f6fbe1 100755 --- a/bin/aliases +++ b/bin/aliases @@ -8,7 +8,7 @@ alias myst-home="cd $GOPATH/src/github.com/mysteriumnetwork/node" alias myst="myst-home" -alias myst-broker="myst-home && docker-compose up broker" +alias myst-broker="myst-home && docker compose up broker" alias myst-nats="myst-broker" alias myst-consumer="myst-home && bin/build && bin/run_consumer" diff --git a/bin/builder_docker/Dockerfile b/bin/builder_docker/Dockerfile index 2bf4b88e21..1c81bcadb8 100644 --- a/bin/builder_docker/Dockerfile +++ b/bin/builder_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20 AS builder +FROM golang:1.22 AS builder # Install FPM RUN apt-get update \ diff --git a/bin/docker/alpine/Dockerfile b/bin/docker/alpine/Dockerfile index 6c241c31b3..99c04e3dac 100644 --- a/bin/docker/alpine/Dockerfile +++ b/bin/docker/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.20-alpine AS builder +FROM --platform=$BUILDPLATFORM golang:1.22-alpine AS builder # Install packages RUN apk add --no-cache git bash gcc musl-dev make linux-headers diff --git a/bin/release_ppa b/bin/release_ppa index 0d87405a86..94a8e1034a 100755 --- a/bin/release_ppa +++ b/bin/release_ppa @@ -48,7 +48,7 @@ echo "myst ($VERSION+build$BUILD+$DISTR) $DISTR; urgency=medium echo '#!/usr/bin/make -f export DH_VERBOSE := 1 -export PATH := /usr/lib/go-1.20/bin/:$(PATH) +export PATH := /usr/lib/go-1.22/bin/:$(PATH) export GOPATH := $(CURDIR)/go export BUILD_COMMIT := '$BUILD_COMMIT' export BUILD_BRANCH := '$BUILD_BRANCH' diff --git a/debian/control b/debian/control index 5387d8279a..050a26b514 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Mysterium Team Build-Depends: dh-golang, debhelper (>= 8.0.0), - golang-1.20, + golang-1.22, Standards-Version: 3.9.7 Homepage: https://mysterium.network Vcs-Git: git://github.com/mysteriumnetwork/node.git diff --git a/e2e/gorunner/Dockerfile b/e2e/gorunner/Dockerfile index acc0ca2727..dfe2f13d63 100644 --- a/e2e/gorunner/Dockerfile +++ b/e2e/gorunner/Dockerfile @@ -1,3 +1,3 @@ -FROM golang:1.20-alpine +FROM golang:1.22-alpine RUN apk add --no-cache bash gcc musl-dev make linux-headers iptables ipset ca-certificates openvpn bash sudo openresolv diff --git a/localnet/node/Dockerfile b/localnet/node/Dockerfile index 52d0b8508a..82a4164d96 100644 --- a/localnet/node/Dockerfile +++ b/localnet/node/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine +FROM golang:1.22-alpine # Install packages RUN apk add --no-cache iptables ipset ca-certificates openvpn wireguard-tools bash sudo openresolv gcc musl-dev make linux-headers vim curl tcpdump