From 4268f6f6ba54c168980f09056b40d9fc151faf15 Mon Sep 17 00:00:00 2001 From: Raaghav Wadhawan Date: Tue, 9 Jan 2024 00:40:49 +0000 Subject: [PATCH 1/4] update golang vz and oracle linux image --- make/build.mk | 4 ++-- module-operator/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/make/build.mk b/make/build.mk index b48fd3c3..3c4bd00d 100644 --- a/make/build.mk +++ b/make/build.mk @@ -63,7 +63,7 @@ run: ## Run a controller from your host. .PHONY: docker-build docker-build: docker-build-common -docker-build-common: BASE_IMAGE ?= ghcr.io/verrazzano/verrazzano-base:v1.0.0-20230529051534-037adf4-4653b27@sha256:73c0b081e13228fbbe5fb87b46cde1781cba25bdf9cf6489daa56460e5e1435b +docker-build-common: BASE_IMAGE ?= ghcr.io/oracle/oraclelinux:9-slim .PHONY: docker-build-common docker-build-common: @echo Building ${NAME} image ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} @@ -74,7 +74,7 @@ docker-build-common: -t ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} .. # Cannot use verrazzano-base here until it supports both arm and amd -docker-build-and-push-multi-arch: BASE_IMAGE ?= ghcr.io/oracle/oraclelinux:8-slim +docker-build-and-push-multi-arch: BASE_IMAGE ?= ghcr.io/oracle/oraclelinux:9-slim .PHONY: docker-build-and-push-multi-arch docker-build-and-push-multi-arch: docker-login @echo Building and pushing ${NAME} multi arch image ${DOCKER_IMAGE_FULLNAME}:${DOCKER_IMAGE_TAG} diff --git a/module-operator/Dockerfile b/module-operator/Dockerfile index c5eb342d..1784fb0d 100644 --- a/module-operator/Dockerfile +++ b/module-operator/Dockerfile @@ -1,8 +1,8 @@ # Copyright (c) 2023, Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -ARG BASE_IMAGE=ghcr.io/oracle/oraclelinux:8-slim +ARG BASE_IMAGE=ghcr.io/oracle/oraclelinux:9-slim -FROM ghcr.io/oracle/oraclelinux:8 AS build_base +FROM ghcr.io/verrazzano/oraclelinux-golang:v1.20.12 AS build_base # Need to use specific WORKDIR to match source packages WORKDIR /root/go/src/github.com/verrazzano/verrazzano-modules From be789a8523196d6341eceb45e611a51ce85690d2 Mon Sep 17 00:00:00 2001 From: Raaghav Wadhawan Date: Tue, 9 Jan 2024 20:30:02 +0000 Subject: [PATCH 2/4] jenkins file update --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1781ff31..5fdedcb9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ def VERRAZZANO_DEV_VERSION = "" def tarfilePrefix="" def storeLocation="" -def agentLabel = env.JOB_NAME.contains('main') ? "phx-large" : "large" +def agentLabel = env.JOB_NAME.contains('main') ? "2.0-phx-large" : "2.0-large" pipeline { options { From 7914a8b326f1e570f74b4688e277e5e7b71de992 Mon Sep 17 00:00:00 2001 From: Raaghav Wadhawan Date: Tue, 9 Jan 2024 21:08:45 +0000 Subject: [PATCH 3/4] dockerfile update --- module-operator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-operator/Dockerfile b/module-operator/Dockerfile index 1784fb0d..b1ee131f 100644 --- a/module-operator/Dockerfile +++ b/module-operator/Dockerfile @@ -11,7 +11,7 @@ COPY . . RUN dnf install -y oraclelinux-developer-release-el8 && \ dnf config-manager --enable ol8_developer && \ dnf update -y && \ - dnf install -y go-toolset-1.19.6 + #dnf install -y go-toolset-1.19.6 # Build the operator binary RUN go build -o /usr/local/bin/verrazzano-module-operator ./module-operator/main.go From 29accbcfd65f630a3e8e3b6a55c05d293181197f Mon Sep 17 00:00:00 2001 From: Raaghav Wadhawan Date: Tue, 9 Jan 2024 21:15:42 +0000 Subject: [PATCH 4/4] dockerfile update2 --- module-operator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-operator/Dockerfile b/module-operator/Dockerfile index b1ee131f..ba6eaad3 100644 --- a/module-operator/Dockerfile +++ b/module-operator/Dockerfile @@ -10,7 +10,7 @@ COPY . . RUN dnf install -y oraclelinux-developer-release-el8 && \ dnf config-manager --enable ol8_developer && \ - dnf update -y && \ + dnf update -y #dnf install -y go-toolset-1.19.6 # Build the operator binary