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

Jump to bottom

[20.10] update go to go1.19.11, debian buster #4440

Merged
merged 2 commits into from
Jul 20, 2023
Merged

[20.10] update go to go1.19.11, debian buster #4440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15a103d
Update to debian bullseye
thaJeztah Dec 9, 2021
9b21793
[20.10] update go to go1.19.11
thaJeztah Jul 17, 2023
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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.19.11
ARG ALPINE_VERSION=3.17
ARG XX_VERSION=1.1.0

Expand All @@ -17,12 +17,12 @@ ARG TARGETPLATFORM
# gcc is installed for libgcc only
RUN xx-apk add --no-cache musl-dev gcc

FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-base-buster
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye
COPY --from=xx / /
RUN apt-get update && apt-get install --no-install-recommends -y clang lld file
WORKDIR /go/src/github.com/docker/cli

FROM build-base-buster AS build-buster
FROM build-base-bullseye AS build-bullseye
ARG TARGETPLATFORM
RUN xx-apt install --no-install-recommends -y libc6-dev libgcc-8-dev

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli

environment:
GOPATH: c:\gopath
GOVERSION: 1.19.10
GOVERSION: 1.19.11
DEPVERSION: v0.4.1

install:
Expand Down
4 changes: 2 additions & 2 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "GO_VERSION" {
default = "1.19.10"
default = "1.19.11"
}
variable "VERSION" {
default = ""
Expand All @@ -22,7 +22,7 @@ target "binary" {
platforms = ["local"]
output = ["build"]
args = {
BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine"
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION
GO_STRIP = STRIP_TARGET
}
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.binary-native
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.19.11

FROM golang:${GO_VERSION}-alpine

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.19.11
ARG ALPINE_VERSION=3.17

FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.19.11

# Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}-buster
FROM golang:${GO_VERSION}-bullseye

RUN apt-get update && apt-get install -y \
build-essential \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.lint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.19.11
ARG ALPINE_VERSION=3.17
ARG GOLANGCI_LINT_VERSION=v1.49.0

Expand Down