Skip to content

update go #269

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

Merged
merged 2 commits into from
Apr 3, 2022
Merged

update go #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72a5f2d
update go
weizhoublue Apr 3, 2022
fbf0a66
dsf
weizhoublue Apr 3, 2022
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
4 changes: 2 additions & 2 deletions Makefile.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
GO_VERSION := 1.18.0
GINKGO_VERSION := 2.1.3
GO_VERSION := 1.17.8
GINKGO_VERSION := 2.1.3
4 changes: 2 additions & 2 deletions cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Ensure build fails on versions of Go that are not supported
// This build tag should be kept in sync with the version specified in go.mod.
//go:build go1.18
// +build go1.18
//go:build go1.17
// +build go1.17

// Copyright 2022 Authors of welan
// SPDX-License-Identifier: Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/weizhoublue/github-action-test

go 1.17.8
go 1.17

require (
github.com/gogo/protobuf v1.3.2
Expand Down
4 changes: 4 additions & 0 deletions images/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,8 @@ baseimage:
--platform=$(PLATFORM) --output $(OUTPUT) \
-f $(ROOT_DIR)/images/controllerimage/Dockerfile $(ROOT_DIR)/

.PHONY: update-golang-image
update-golang-image:
GO_VERSION=$(GO_VERSION) scripts/update-golang-image.sh


2 changes: 1 addition & 1 deletion images/baseimage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# on the local directory, ,run: docker buildx build -t testbase:latest --platform=linux/arm64,linux/amd64 --output type=docker .


ARG GOLANG_IMAGE=docker.io/library/golang:1.18.0@sha256:03baa0921adf5fb547f48df8b16137de82b5ccc34986c22a967055379369f614
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.8@sha256:f675106e44f205a7284e15cd75c41b241329f3c03ac30b0ba07b14a6ea7c99d9
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:8ae9bafbb64f63a50caab98fd3a5e37b3eb837a3e0780b78e5218e63193961f9

#========= build gops ===============
Expand Down
2 changes: 1 addition & 1 deletion images/controllerimage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# docker buildx build -t release:latest --build-arg VERSION=${VERSION} --build-arg GIT_COMMIT_TIME=${GIT_COMMIT_TIME} --build-arg GIT_COMMIT_VERSION=${GIT_COMMIT_VERSION} --platform=linux/amd64,linux/arm64 --output type=docker -f ./images/controllerimage/Dockerfile .

ARG BASE_IMAGE=ghcr.io/weizhoublue/github-action-test/baseimage:8700413ad57ead614f734b1311cf83231941713c@sha256:118ffa12150f4e6572a694250e7d7ce6fd6a555d28231f751c0089e2aa6f9f86
ARG GOLANG_IMAGE=docker.io/library/golang:1.18.0@sha256:03baa0921adf5fb547f48df8b16137de82b5ccc34986c22a967055379369f614
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.8@sha256:f675106e44f205a7284e15cd75c41b241329f3c03ac30b0ba07b14a6ea7c99d9

# TARGETARCH is an automatic platform ARG enabled by Docker BuildKit.
# like amd64 arm64
Expand Down
2 changes: 0 additions & 2 deletions images/scripts/update-golang-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,4 @@ used_by=($(git grep -l GOLANG_IMAGE= images/*/Dockerfile))
for i in "${used_by[@]}" ; do
# golang images with image digest
sed "s|GOLANG_IMAGE=docker\.io/library/golang:[0-9][0-9]*\.[0-9][0-9]*\(\.[0-9][0-9]*\)\?@.*|GOLANG_IMAGE=${image}@${image_digest}|" "${i}" > "${i}.sedtmp" && mv "${i}.sedtmp" "${i}"
#sed "s|GOLANG_IMAGE=docker\.io/library/golang:[0-9][0-9]*\.[0-9][0-9]*\(\.[0-9][0-9]*\)\?@.*|GOLANG_IMAGE=${image}@${image_digest}|" "${i}" > "${i}.sedtmp"

done