From a7d1cc42e6048a1e39c31f9fc28bacf178136c5c Mon Sep 17 00:00:00 2001 From: Juan Bustamante Date: Thu, 30 May 2024 12:04:19 -0500 Subject: [PATCH] Updating the docker base image to use go 1.22, also removing ubuntu lunar becase it is deprecated, we don't need to support it anymore Signed-off-by: Juan Bustamante --- .github/workflows/delivery-ubuntu.yml | 14 +------------- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/delivery-ubuntu.yml b/.github/workflows/delivery-ubuntu.yml index dc38a65479..c62bb24bef 100644 --- a/.github/workflows/delivery-ubuntu.yml +++ b/.github/workflows/delivery-ubuntu.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - target: [bionic, focal, jammy, lunar, noble] + target: [bionic, focal, jammy, noble] runs-on: ubuntu-20.04 steps: - name: Checkout code @@ -103,18 +103,6 @@ jobs: GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} PACKAGE_VERSION: ${{ steps.version.outputs.result }} - - name: Deliver lunar - if: matrix.target == 'lunar' - uses: docker://ubuntu:lunar - with: - entrypoint: .github/workflows/delivery/ubuntu/deliver.sh - env: - DEBIAN_FRONTEND: "noninteractive" - GO_DEP_PACKAGE_NAME: golang - GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} - PACKAGE_VERSION: ${{ steps.version.outputs.result }} - - name: Deliver noble if: matrix.target == 'noble' uses: docker://ubuntu:noble diff --git a/Dockerfile b/Dockerfile index c81b2f0c04..93bd02e689 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG base_image=gcr.io/distroless/static -FROM golang:1.20 as builder +FROM golang:1.22 as builder ARG pack_version ENV PACK_VERSION=$pack_version WORKDIR /app