Merge pull request #59 from chrisd8088/go-1.21.1-with-perms-fix

Update to Go 1.21.1 and set different file permissions in update script

Author: chrisd8088

build_dockers.bsh

@@ -21,13 +21,13 @@ do
   esac
 done
 
-: ${GOLANG_VERSION:=1.20.6}
+: ${GOLANG_VERSION:=1.21.1}
 case "$GOLANG_ARCH" in
   amd64)
-    : ${GOLANG_SHA256:=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb}
+    : ${GOLANG_SHA256:=b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae}
     ;;
   arm64)
-    : ${GOLANG_SHA256:=4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b}
+    : ${GOLANG_SHA256:=7da1a3936a928fd0b2602ed4f3ef535b8cd1990f1503b8d3e1acc0fa0759c967}
     ;;
 esac
 export GOLANG_VERSION GOLANG_SHA256 GOLANG_ARCH

centos_7.Dockerfile

@@ -19,8 +19,8 @@ RUN yum install -y gettext-devel libcurl-devel openssl-devel perl-CPAN perl-deve
   make install && \
   git --version
 
-ARG GOLANG_VERSION=1.20.6
-ARG GOLANG_SHA256=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb
+ARG GOLANG_VERSION=1.21.1
+ARG GOLANG_SHA256=b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 ARG GOLANG_ARCH=amd64
 
 ENV GOROOT=/usr/local/go

centos_8.Dockerfile

@@ -4,8 +4,8 @@ RUN yum -y upgrade
 RUN yum install -y rsync ruby ruby-devel rubygems-devel gcc
 RUN yum install -y gettext-devel libcurl-devel openssl-devel perl-CPAN perl-devel zlib-devel make wget autoconf git
 
-ARG GOLANG_VERSION=1.20.6
-ARG GOLANG_SHA256=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb
+ARG GOLANG_VERSION=1.21.1
+ARG GOLANG_SHA256=b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 ARG GOLANG_ARCH=amd64
 
 ENV GOROOT=/usr/local/go

debian_10.Dockerfile

@@ -6,8 +6,8 @@ LABEL RUN="docker run -v git-lfs-checkout-dir:/src -v repo_dir:/repo"
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \
 apt-get install -y gettext git dpkg-dev dh-golang asciidoctor curl
 
-ARG GOLANG_VERSION=1.20.6
-ARG GOLANG_SHA256=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb
+ARG GOLANG_VERSION=1.21.1
+ARG GOLANG_SHA256=b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 ARG GOLANG_ARCH=amd64
 
 ENV GOROOT=/usr/local/go

debian_11.Dockerfile

@@ -8,8 +8,8 @@ RUN dpkg --add-architecture i386
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \
 apt-get install -y --no-install-recommends gettext git dpkg-dev dh-golang asciidoctor curl build-essential gcc-i686-linux-gnu libc6-dev:i386
 
-ARG GOLANG_VERSION=1.20.6
-ARG GOLANG_SHA256=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb
+ARG GOLANG_VERSION=1.21.1
+ARG GOLANG_SHA256=b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 ARG GOLANG_ARCH=amd64
 
 ENV GOROOT=/usr/local/go

debian_12.Dockerfile

@@ -8,8 +8,8 @@ RUN dpkg --add-architecture i386
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \
 apt-get install -y --no-install-recommends gettext git dpkg-dev dh-golang asciidoctor curl build-essential gcc-i686-linux-gnu libc6-dev:i386
 
-ARG GOLANG_VERSION=1.20.6
-ARG GOLANG_SHA256=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb
+ARG GOLANG_VERSION=1.21.1
+ARG GOLANG_SHA256=b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 ARG GOLANG_ARCH=amd64
 
 ENV GOROOT=/usr/local/go

rocky_9.Dockerfile

@@ -4,8 +4,8 @@ RUN yum -y upgrade
 RUN yum install -y rsync ruby ruby-devel rubygems-devel gcc
 RUN yum install -y gettext-devel libcurl-devel openssl-devel perl-CPAN perl-devel zlib-devel make wget autoconf git
 
-ARG GOLANG_VERSION=1.20.6
-ARG GOLANG_SHA256=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb
+ARG GOLANG_VERSION=1.21.1
+ARG GOLANG_SHA256=b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 ARG GOLANG_ARCH=amd64
 
 ENV GOROOT=/usr/local/go

update-hashes

@@ -8,17 +8,17 @@ require 'json'
 require 'net/http'
 require 'tempfile'
 
-def rewrite_file(name)
+def rewrite_file(name, mode)
   r = File.open(name, "r")
   w = Tempfile.new(name, ".")
   yield r, w
   r.close
-  w.chmod(0755)
+  w.chmod(mode)
   File.rename(w.path, r.path)
 end
 
 def update_main_repo(version, hashes)
-  rewrite_file("build_dockers.bsh") do |r, w|
+  rewrite_file("build_dockers.bsh", 0755) do |r, w|
     puts "Processing build_dockers.bsh"
     arch = nil
     in_arch = false
@@ -45,7 +45,7 @@ def update_main_repo(version, hashes)
 end
 
 def update_dockerfile(name, version, hashes)
-  rewrite_file(name) do |r, w|
+  rewrite_file(name, 0644) do |r, w|
     puts "Processing #{name}"
     while line = r.gets
       case line