Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build for alpine 3.19 and update to Go 1.21 #163

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Fix build for alpine 3.19 and update to Go 1.21 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions build/docker/alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions build/docker/debian.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/*
Expand Down Expand Up @@ -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

Expand Down