Update goenv clone URLs

`master` branch will no longer be the default and move to `main`.

`master` is the legacy v2 model and `main` is v3 - a fully go-based CLI. We will need some time to migrate these images to use the compiled binaries instead and add support for all platforms/archs.

We plan to keep support until EoY 2028. This will give us plenty of time to test and migrate everything safely and correctly

Author: ChronosMasterOfAllTime

al/aarch64/standard/2.0/Dockerfile

@@ -26,18 +26,18 @@ RUN set -ex \
     && amazon-linux-extras enable docker \
     && yum groupinstall -yq "Development tools" \
     && yum install -yq \
-           GeoIP-devel ImageMagick asciidoc bzip2-devel bzr bzrtools cvs cvsps \
-           docbook-dtds docbook-style-xsl dpkg-dev e2fsprogs expat-devel expect fakeroot \
-           glib2-devel groff gzip icu iptables jq krb5-server libargon2-devel \
-           libcurl-devel libdb-devel libedit-devel libevent-devel libffi-devel \
-           libicu-devel libjpeg-devel libpng-devel libserf libsqlite3x-devel \
-           libtidy-devel libunwind libwebp-devel libxml2-devel libxslt libxslt-devel \
-           libyaml-devel libzip-devel mariadb-devel mlocate \
-           ncurses-devel oniguruma-devel openssl openssl-devel perl-DBD-SQLite \
-           perl-DBI perl-HTTP-Date perl-IO-Pty-Easy perl-TimeDate perl-YAML-LibYAML perl perl-FindBin \
-           postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \
-           subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \
-           amazon-ecr-credential-helper runc
+    GeoIP-devel ImageMagick asciidoc bzip2-devel bzr bzrtools cvs cvsps \
+    docbook-dtds docbook-style-xsl dpkg-dev e2fsprogs expat-devel expect fakeroot \
+    glib2-devel groff gzip icu iptables jq krb5-server libargon2-devel \
+    libcurl-devel libdb-devel libedit-devel libevent-devel libffi-devel \
+    libicu-devel libjpeg-devel libpng-devel libserf libsqlite3x-devel \
+    libtidy-devel libunwind libwebp-devel libxml2-devel libxslt libxslt-devel \
+    libyaml-devel libzip-devel mariadb-devel mlocate \
+    ncurses-devel oniguruma-devel openssl openssl-devel perl-DBD-SQLite \
+    perl-DBI perl-HTTP-Date perl-IO-Pty-Easy perl-TimeDate perl-YAML-LibYAML perl perl-FindBin \
+    postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \
+    subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \
+    amazon-ecr-credential-helper runc
 
 RUN useradd codebuild-user
 
@@ -47,33 +47,33 @@ FROM core AS tools
 
 # Install Git
 RUN set -ex \
-   && GIT_VERSION=2.39.1 \
-   && GIT_TAR_FILE=git-$GIT_VERSION.tar.gz \
-   && GIT_SRC=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz  \
-   && curl -L -o $GIT_TAR_FILE $GIT_SRC \
-   && tar zxf $GIT_TAR_FILE \
-   && cd git-$GIT_VERSION \
-   && make -j4 prefix=/usr \
-   && make install prefix=/usr \
-   && cd .. ; rm -rf git-$GIT_VERSION \
-   && rm -rf $GIT_TAR_FILE /tmp/*
+    && GIT_VERSION=2.39.1 \
+    && GIT_TAR_FILE=git-$GIT_VERSION.tar.gz \
+    && GIT_SRC=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz  \
+    && curl -L -o $GIT_TAR_FILE $GIT_SRC \
+    && tar zxf $GIT_TAR_FILE \
+    && cd git-$GIT_VERSION \
+    && make -j4 prefix=/usr \
+    && make install prefix=/usr \
+    && cd .. ; rm -rf git-$GIT_VERSION \
+    && rm -rf $GIT_TAR_FILE /tmp/*
 
 # Install stunnel
 RUN set -ex \
-   && STUNNEL_VERSION=5.68 \
-   && STUNNEL_TAR=stunnel-$STUNNEL_VERSION.tar.gz \
-   && STUNNEL_SHA256="dcd895ab088b043d4e0bafa8b934e7ab3e697293828dbe9fce46cb7609a7dacf" \
-   && curl -o $STUNNEL_TAR https://www.usenix.org.uk/mirrors/stunnel/archive/5.x/$STUNNEL_TAR \
-   && echo "$STUNNEL_SHA256 $STUNNEL_TAR" | sha256sum -c - \
-   && tar xvfz $STUNNEL_TAR \
-   && cd stunnel-$STUNNEL_VERSION \
-   && ./configure \
-   && make -j4 \
-   && make install \
-   && openssl genrsa -out key.pem 2048 \
-   && openssl req -new -x509 -key key.pem -out cert.pem -days 1095 -subj "/C=US/ST=Washington/L=Seattle/O=Amazon/OU=Codebuild/CN=codebuild.amazon.com" \
-   && cat key.pem cert.pem >> /usr/local/etc/stunnel/stunnel.pem \
-   && cd .. ; rm -rf stunnel-${STUNNEL_VERSION}*
+    && STUNNEL_VERSION=5.68 \
+    && STUNNEL_TAR=stunnel-$STUNNEL_VERSION.tar.gz \
+    && STUNNEL_SHA256="dcd895ab088b043d4e0bafa8b934e7ab3e697293828dbe9fce46cb7609a7dacf" \
+    && curl -o $STUNNEL_TAR https://www.usenix.org.uk/mirrors/stunnel/archive/5.x/$STUNNEL_TAR \
+    && echo "$STUNNEL_SHA256 $STUNNEL_TAR" | sha256sum -c - \
+    && tar xvfz $STUNNEL_TAR \
+    && cd stunnel-$STUNNEL_VERSION \
+    && ./configure \
+    && make -j4 \
+    && make install \
+    && openssl genrsa -out key.pem 2048 \
+    && openssl req -new -x509 -key key.pem -out cert.pem -days 1095 -subj "/C=US/ST=Washington/L=Seattle/O=Amazon/OU=Codebuild/CN=codebuild.amazon.com" \
+    && cat key.pem cert.pem >> /usr/local/etc/stunnel/stunnel.pem \
+    && cd .. ; rm -rf stunnel-${STUNNEL_VERSION}*
 
 # AWS Tools
 # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/eks/latest/userguide/install-kubectl.html
@@ -90,13 +90,13 @@ RUN set -ex \
 ## Dotnet
 ENV PATH="/root/.dotnet/:/root/.dotnet/tools/:$PATH"
 RUN set -ex  \
-&& wget -qO /usr/local/bin/dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
-&& chmod +x /usr/local/bin/dotnet-install.sh
+    && wget -qO /usr/local/bin/dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
+    && chmod +x /usr/local/bin/dotnet-install.sh
 
 ##nodejs
 ENV N_SRC_DIR="$SRC_DIR/n"
 RUN git clone https://github.com/tj/n $N_SRC_DIR \
-     && cd $N_SRC_DIR && make install
+    && cd $N_SRC_DIR && make install
 
 ##ruby
 ENV RBENV_SRC_DIR="/usr/local/rbenv"
@@ -119,7 +119,7 @@ RUN curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin
 ENV PATH="/root/.phpenv/shims:/root/.phpenv/bin:$PATH"
 
 ##go
-RUN git clone https://github.com/syndbg/goenv.git $HOME/.goenv
+RUN git clone -b master https://github.com/go-nv/goenv.git $HOME/.goenv
 ENV PATH="/root/.goenv/shims:/root/.goenv/bin:/go/bin:$PATH"
 ENV GOENV_DISABLE_GOPATH=1
 ENV GOPATH="/go"
@@ -166,11 +166,11 @@ RUN set -x \
     # Note: We will use update-alternatives to make sure JDK11 has higher priority for all the tools
     && yum install -yq java-11-amazon-corretto \
     && for tool_path in $JAVA_HOME/bin/*; do \
-          tool=`basename $tool_path`; \
-          update-alternatives --install /usr/bin/$tool $tool $tool_path 10000; \
-          update-alternatives --set $tool $tool_path; \
-        done \
-     && rm $JAVA_HOME/lib/security/cacerts && ln -s /etc/pki/java/cacerts $JAVA_HOME/lib/security/cacerts \
+    tool=`basename $tool_path`; \
+    update-alternatives --install /usr/bin/$tool $tool $tool_path 10000; \
+    update-alternatives --set $tool $tool_path; \
+    done \
+    && rm $JAVA_HOME/lib/security/cacerts && ln -s /etc/pki/java/cacerts $JAVA_HOME/lib/security/cacerts \
     # Install Ant
     && curl -LSso /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz  \
     && echo "$ANT_DOWNLOAD_SHA512 /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz" | sha512sum -c - \
@@ -190,17 +190,17 @@ RUN set -ex \
     # Install Gradle
     && mkdir -p $GRADLE_PATH \
     && for version in $INSTALLED_GRADLE_VERSIONS; do { \
-       wget -q "https://services.gradle.org/distributions/gradle-$version-all.zip" -O "$GRADLE_PATH/gradle-$version-all.zip" \
-       && unzip -q "$GRADLE_PATH/gradle-$version-all.zip" -d /usr/local \
-       && echo -e "$GRADLE_DOWNLOADS_SHA256" | grep "$version" | sed "s|$version|$GRADLE_PATH/gradle-$version-all.zip|" | sha256sum -c - \
-       && rm "$GRADLE_PATH/gradle-$version-all.zip" \
-       && mkdir "/tmp/gradle-$version" \
-       && "/usr/local/gradle-$version/bin/gradle" -p "/tmp/gradle-$version" wrapper \
-       && perl -pi -e "s/gradle-$version-bin.zip/gradle-$version-all.zip/" "/tmp/gradle-$version/gradle/wrapper/gradle-wrapper.properties" \
-       && "/tmp/gradle-$version/gradlew" -p "/tmp/gradle-$version" init \
-       && rm -rf "/tmp/gradle-$version" \
-       && if [ "$version" != "$GRADLE_VERSION" ]; then rm -rf "/usr/local/gradle-$version"; fi; \
-     }; done \
+    wget -q "https://services.gradle.org/distributions/gradle-$version-all.zip" -O "$GRADLE_PATH/gradle-$version-all.zip" \
+    && unzip -q "$GRADLE_PATH/gradle-$version-all.zip" -d /usr/local \
+    && echo -e "$GRADLE_DOWNLOADS_SHA256" | grep "$version" | sed "s|$version|$GRADLE_PATH/gradle-$version-all.zip|" | sha256sum -c - \
+    && rm "$GRADLE_PATH/gradle-$version-all.zip" \
+    && mkdir "/tmp/gradle-$version" \
+    && "/usr/local/gradle-$version/bin/gradle" -p "/tmp/gradle-$version" wrapper \
+    && perl -pi -e "s/gradle-$version-bin.zip/gradle-$version-all.zip/" "/tmp/gradle-$version/gradle/wrapper/gradle-wrapper.properties" \
+    && "/tmp/gradle-$version/gradlew" -p "/tmp/gradle-$version" init \
+    && rm -rf "/tmp/gradle-$version" \
+    && if [ "$version" != "$GRADLE_VERSION" ]; then rm -rf "/usr/local/gradle-$version"; fi; \
+    }; done \
     # Install default GRADLE_VERSION to path
     && ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
     && rm -rf $GRADLE_PATH \
@@ -213,7 +213,7 @@ ENV PATH "/usr/local/bin/sbt/bin:$PATH"
 RUN sbt version
 # Cleanup
 RUN rm -fr /tmp/* /var/tmp/* \
-     && yum clean all
+    && yum clean all
 #****************     END JAVA     ****************************************************
 
 
@@ -240,11 +240,11 @@ RUN set -ex \
 ENV NODE_10_VERSION="10.24.1"
 
 RUN  n $NODE_10_VERSION && npm install --save-dev -g -f grunt && npm install --save-dev -g -f grunt-cli && npm install --save-dev -g -f webpack \
-     && curl -sSL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo \
-     && rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg \
-     && yum install -yq yarn \
-     && yarn --version \
-     && cd / && rm -rf $N_SRC_DIR; rm -rf /tmp/*
+    && curl -sSL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo \
+    && rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg \
+    && yum install -yq yarn \
+    && yarn --version \
+    && cd / && rm -rf $N_SRC_DIR; rm -rf /tmp/*
 
 #****************      END NODEJS     ****************************************************
 
@@ -398,7 +398,7 @@ RUN set -ex \
 ENV NODE_12_VERSION="12.22.2"
 
 RUN  n $NODE_12_VERSION && npm install --save-dev -g -f grunt && npm install --save-dev -g -f grunt-cli && npm install --save-dev -g -f webpack \
-     && rm -rf /tmp/*
+    && rm -rf /tmp/*
 
 #=======================End of layer: runtimes_2  =================
 FROM runtimes_2 AS runtimes_3
@@ -450,4 +450,4 @@ COPY amazon-ssm-agent.json          /etc/amazon/ssm/
 
 ENTRYPOINT ["dockerd-entrypoint.sh"]
 
-#=======================End of layer: aarch64_v2  =================
+#=======================End of layer: aarch64_v2  =================