Skip to content

Commit

Permalink
Bump to go 1.17
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Mohr <[email protected]>
  • Loading branch information
rmohr committed Mar 11, 2022
1 parent c35e407 commit 8c275ea
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ COPY ./build.sh /root/containerbuild/
RUN ./build.sh configure_yum_repos
RUN ./build.sh install_rpms # nocache 03/10/22

# install golang
ENV PATH="/usr/local/go/bin:${PATH}"
RUN ./build.sh install_golang

# This allows Prow jobs for other projects to use our cosa image as their
# buildroot image (so clonerefs can copy the repo into `/go`). For cosa itself,
# this same hack is inlined in the YAML (see openshift/release link above).
Expand Down
8 changes: 8 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if [ $# -gt 1 ]; then
echo " configure_user"
echo " configure_yum_repos"
echo " install_rpms"
echo " install_golang"
echo " make_and_makeinstall"
exit 1
fi
Expand All @@ -34,6 +35,12 @@ configure_yum_repos() {
echo -e "[f${version_id}-coreos-continuous]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://kojipkgs.fedoraproject.org/repos-dist/f${version_id}-coreos-continuous/latest/\$basearch/\ngpgcheck=0\nskip_if_unavailable=False\n" > /etc/yum.repos.d/coreos.repo
}

install_golang() {
curl -L -O https://go.dev/dl/go1.17.8.linux-amd64.tar.gz
rm -rf /usr/local/go && tar -C /usr/local -xzf go1.17.8.linux-amd64.tar.gz
go version
}

install_rpms() {
local builddeps
local frozendeps
Expand Down Expand Up @@ -125,6 +132,7 @@ else
# Otherwise, just run all the steps
configure_yum_repos
install_rpms
install_golang
write_archive_info
make_and_makeinstall
configure_user
Expand Down
2 changes: 1 addition & 1 deletion src/build-deps.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Used by mantle
golang
gcc

0 comments on commit 8c275ea

Please sign in to comment.