From c3bda1ea3310c8623d2d8dc7e5b580a9ad9331fe Mon Sep 17 00:00:00 2001
From: Linus Karlsson <197840+zozs@users.noreply.github.com>
Date: Mon, 11 Dec 2023 14:07:35 +0100
Subject: [PATCH] Fix build for alpine 3.19 and update to Go 1.21 (#163)

---
 build/docker/alpine.Dockerfile | 7 +++----
 build/docker/debian.Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index c0d0266e..5626c70f 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS dev
+FROM golang:1.21-alpine AS dev
 WORKDIR /cli
 RUN apk update \
   && apk --no-cache --update add git build-base
@@ -44,7 +44,7 @@ RUN apk --no-cache --update add \
   python3 \
   py3-scipy \
   py3-pip \
-  go~=1.20 \
+  go~=1.21 \
   nodejs \
   yarn \
   dotnet7-sdk \
@@ -59,8 +59,7 @@ RUN apk add --no-cache \
     php82-curl \
     php82-mbstring \
     php82-openssl \
-    php82-phar \
-    && ln -s /usr/bin/php82 /usr/bin/php
+    php82-phar
 
 RUN apk add --no-cache --virtual build-dependencies curl && \
     curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile
index 67742cc7..df9028f4 100644
--- a/build/docker/debian.Dockerfile
+++ b/build/docker/debian.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-bullseye AS dev
+FROM golang:1.21-bullseye AS dev
 WORKDIR /cli
 RUN apt -y update && apt -y upgrade && apt -y install git && \
     apt -y clean && rm -rf /var/lib/apt/lists/*
@@ -73,13 +73,13 @@ RUN apt -y update && apt -y upgrade && apt -y install openjdk-11-jre \
     python3-venv \
     ca-certificates \
     python3-pip && \
-    apt -y install -t testing golang-1.20 && \
+    apt -y install -t testing golang-1.21 && \
     apt -y clean && rm -rf /var/lib/apt/lists/* && \
     # Symlink pip3 to pip, we assume that "pip" works in CLI
     ln -sf /usr/bin/pip3 /usr/bin/pip && \
     ln -sf /usr/bin/python3 /usr/bin/python && \
     # Symlink go binary to bin directory which is in path
-    ln -s /usr/lib/go-1.20/bin/go /usr/bin/go
+    ln -s /usr/lib/go-1.21/bin/go /usr/bin/go
 
 RUN dotnet --version