Skip to content

Commit

Permalink
Merge pull request #427 from projectcalico/golang-1.20.2-buster-base-…
Browse files Browse the repository at this point in the history
…image

Use official golang 1.20.2 buster base image
  • Loading branch information
mgleung authored Mar 29, 2023
2 parents 7368517 + 6b06467 commit 5251094
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Dockerfile.amd64
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM calico/bpftool:v5.3-amd64 as bpftool

FROM us-docker.pkg.dev/google.com/api-project-999119582588/go-boringcrypto/golang:1.18.9b7
FROM golang:1.20.2-buster
MAINTAINER Shaun Crampton <shaun@projectcalico.org>

ARG GO_VERSION=1.20.2
ARG QEMU_VERSION=4.2.0-6

# we need these two distinct lists. The first one is the names used by the qemu distributions
Expand Down Expand Up @@ -46,9 +45,6 @@ RUN echo 'APT::Default-Release "buster";' > /etc/apt/apt.conf.d/99defaultrelease

RUN rm /etc/apt/sources.list.d/buster-backports.list

RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz
RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz
RUN rm go${GO_VERSION}.linux-amd64.tar.gz
RUN wget https://apt.llvm.org/llvm.sh
RUN bash ./llvm.sh 12
RUN apt install clang-12
Expand Down

0 comments on commit 5251094

Please sign in to comment.