From 3a9c10c8a531a3b53fb4a5143d7d24e08cbc1af1 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Sun, 29 May 2022 16:00:07 +0100 Subject: [PATCH] Updated base image Signed-off-by: Marcus Noble --- Dockerfile | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c723cd9..c72231b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:19.10 +FROM ubuntu:21.10 RUN apt-get update -y RUN apt-get install -y software-properties-common && \ @@ -15,7 +15,7 @@ RUN apt-get install -y \ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash RUN curl -L https://raw.githubusercontent.com/warrensbox/terraform-switcher/release/install.sh | bash RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.24.0 -RUN go get -u golang.org/x/lint/golint +RUN go install golang.org/x/lint/golint@latest RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl \ && chmod +x ./kubectl \ && mv ./kubectl /usr/local/bin/kubectl diff --git a/Makefile b/Makefile index 3f629aa..22a2dee 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .DEFAULT_GOAL := default -IMAGE ?= docker.cluster.fun/private/ci-builder:latest +IMAGE ?= rg.fr-par.scw.cloud/averagemarcus/ci-builder:latest .PHONY: test # Run all tests, linting and format checks test: lint check-format run-tests