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

Rebuild module-operator-1.7 against golang-1.20.12 #205

Open
wants to merge 4 commits into
base: release/1.7
Choose a base branch
from
Open

Rebuild module-operator-1.7 against golang-1.20.12 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4268f6f
update golang vz and oracle linux image
Raaghavcodes Jan 9, 2024
be789a8
jenkins file update
Raaghavcodes Jan 9, 2024
7914a8b
dockerfile update
Raaghavcodes Jan 9, 2024
29accbc
dockerfile update2
Raaghavcodes Jan 9, 2024
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions make/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions module-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# 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
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 update -y
#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
Expand Down