diff --git a/library/golang/1.24-alpine/Dockerfile b/library/golang/1.24-alpine/Dockerfile index f427fdca..47bb69b2 100644 --- a/library/golang/1.24-alpine/Dockerfile +++ b/library/golang/1.24-alpine/Dockerfile @@ -10,11 +10,11 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV PATH /usr/local/go/bin:$PATH -ENV GOLANG_VERSION 1.24.11 +ENV GOLANG_VERSION 1.24.13 RUN set -eux; \ - url='http://ftp.loongnix.cn/toolchain/golang/go-1.24/abi1.0/go1.24.11.linux-loong64.tar.gz'; \ - sha256='c1008a06d62cffbc13e768e925b34c143448a4e1cd334891e08f2be0326925d6'; \ + url='http://ftp.loongnix.cn/toolchain/golang/go-1.24/abi1.0/go1.24.13.linux-loong64.tar.gz'; \ + sha256='6fefd25b7ee0ca08de7937fb25c947fffe694160f45c2ed0cdefe84b497a8f65'; \ wget -O go.tgz "$url" --progress=dot:giga; \ echo "$sha256 *go.tgz" | sha256sum -c -; \ tar -C /usr/local -xzf go.tgz; \ diff --git a/library/golang/1.24-alpine/Makefile b/library/golang/1.24-alpine/Makefile index da4a468d..a66c1e1e 100644 --- a/library/golang/1.24-alpine/Makefile +++ b/library/golang/1.24-alpine/Makefile @@ -3,17 +3,23 @@ REGISTRY ?= cr.loongnix.cn ORGANIZATION ?= library REPOSITORY ?= golang -TAG ?= 1.24-alpine +GOMAJOR ?= 1.24 +GOMINOR ?= 13 +OSVERSION ?= alpine +TAG ?= $(GOMAJOR)-$(OSVERSION) -IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +ALIAS0 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR)-$(OSVERSION) default: image image: - echo "ci test latest" - docker build \ - -t $(IMAGE) \ - . + docker build -t $(IMAGE) . -push: +push: alias docker push $(IMAGE) + docker push $(ALIAS0) + +alias: + docker tag $(IMAGE) $(ALIAS0) + diff --git a/library/golang/1.24-buster/Dockerfile b/library/golang/1.24-buster/Dockerfile index e7bcead9..d1b86948 100644 --- a/library/golang/1.24-buster/Dockerfile +++ b/library/golang/1.24-buster/Dockerfile @@ -14,11 +14,11 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV PATH /usr/local/go/bin:$PATH -ENV GOLANGVERSION 1.24.11 +ENV GOLANGVERSION 1.24.13 RUN set -eux; \ - url='http://ftp.loongnix.cn/toolchain/golang/go-1.24/abi1.0/go1.24.11.linux-loong64.tar.gz'; \ - sha256='c1008a06d62cffbc13e768e925b34c143448a4e1cd334891e08f2be0326925d6'; \ + url='http://ftp.loongnix.cn/toolchain/golang/go-1.24/abi1.0/go1.24.13.linux-loong64.tar.gz'; \ + sha256='6fefd25b7ee0ca08de7937fb25c947fffe694160f45c2ed0cdefe84b497a8f65'; \ wget -O go.tgz "$url" --progress=dot:giga; \ echo "$sha256 *go.tgz" | sha256sum -c -; \ tar -C /usr/local -xzf go.tgz; \ diff --git a/library/golang/1.24-buster/Makefile b/library/golang/1.24-buster/Makefile index 763428f5..5ab1cd64 100644 --- a/library/golang/1.24-buster/Makefile +++ b/library/golang/1.24-buster/Makefile @@ -1,24 +1,31 @@ # This file is generated by the template. -REGISTRY ?= cr.loongnix.cn -ORGANIZATION ?= library -REPOSITORY ?= golang -TAG ?= 1.24-buster +REGISTRY ?= cr.loongnix.cn +ORGANIZATION ?= library +REPOSITORY ?= golang + +GOMAJOR ?= 1.24 +GOMINOR ?= 13 +OSVERSION ?= buster +TAG ?= $(GOMAJOR)-$(OSVERSION) + +IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +ALIAS0 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR) +ALIAS1 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR)-$(OSVERSION) +ALIAS2 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR) -IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) -ALIAS = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):1.24 LATEST = default: image image: - docker build \ - -t $(IMAGE) \ - . + docker build -t $(IMAGE) . push: alias docker push $(IMAGE) - docker push $(ALIAS) + docker push $(ALIAS0) + docker push $(ALIAS1) + docker push $(ALIAS2) ifneq ($(LATEST),) docker tag $(IMAGE) $(LATEST) @@ -26,4 +33,6 @@ ifneq ($(LATEST),) endif alias: - docker tag $(IMAGE) $(ALIAS) + docker tag $(IMAGE) $(ALIAS0) + docker tag $(IMAGE) $(ALIAS1) + docker tag $(IMAGE) $(ALIAS2) diff --git a/library/golang/1.24-rhel/Dockerfile b/library/golang/1.24-rhel/Dockerfile index a94694d3..8f6455e5 100644 --- a/library/golang/1.24-rhel/Dockerfile +++ b/library/golang/1.24-rhel/Dockerfile @@ -13,11 +13,11 @@ RUN set -eux; \ ; ENV PATH /usr/local/go/bin:$PATH -ENV GOLANGVERSION 1.24.11 +ENV GOLANGVERSION 1.24.13 RUN set -eux; \ - url='http://ftp.loongnix.cn/toolchain/golang/go-1.24/abi1.0/go1.24.11.linux-loong64.tar.gz'; \ - sha256='c1008a06d62cffbc13e768e925b34c143448a4e1cd334891e08f2be0326925d6'; \ + url='http://ftp.loongnix.cn/toolchain/golang/go-1.24/abi1.0/go1.24.13.linux-loong64.tar.gz'; \ + sha256='6fefd25b7ee0ca08de7937fb25c947fffe694160f45c2ed0cdefe84b497a8f65'; \ wget -O go.tgz "$url" --progress=dot:giga; \ echo "$sha256 *go.tgz" | sha256sum -c -; \ tar -C /usr/local -xzf go.tgz; \ diff --git a/library/golang/1.24-rhel/Makefile b/library/golang/1.24-rhel/Makefile index 2f1cb594..51f8e9e0 100644 --- a/library/golang/1.24-rhel/Makefile +++ b/library/golang/1.24-rhel/Makefile @@ -12,7 +12,7 @@ LATEST = default: image image: - docker build \ + docker build --add-host ftp.loongnix.cn:10.130.43.243 \ -t $(IMAGE) \ . diff --git a/library/golang/1.25-alpine/Dockerfile b/library/golang/1.25-alpine/Dockerfile index e22bfbd1..3f287434 100644 --- a/library/golang/1.25-alpine/Dockerfile +++ b/library/golang/1.25-alpine/Dockerfile @@ -10,11 +10,11 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV PATH /usr/local/go/bin:$PATH -ENV GOLANG_VERSION 1.25.5 +ENV GOLANG_VERSION 1.25.11 RUN set -eux; \ - url='http://ftp.loongnix.cn/toolchain/golang/go-1.25/abi1.0/go1.25.5.linux-loong64.tar.gz'; \ - sha256='94b18b1253d303268f382222a13df33fd209883572dcf508df57144d05416b1a'; \ + url='http://ftp.loongnix.cn/toolchain/golang/go-1.25/abi1.0/go1.25.11.linux-loong64.tar.gz'; \ + sha256='ec78e8ab40288262c26d323d91f3f1daf4afce57c0316f063167cefb6264dd39'; \ wget -O go.tgz "$url" --progress=dot:giga; \ echo "$sha256 *go.tgz" | sha256sum -c -; \ tar -C /usr/local -xzf go.tgz; \ diff --git a/library/golang/1.25-alpine/Makefile b/library/golang/1.25-alpine/Makefile index 1b277683..d1a5626e 100644 --- a/library/golang/1.25-alpine/Makefile +++ b/library/golang/1.25-alpine/Makefile @@ -3,17 +3,22 @@ REGISTRY ?= cr.loongnix.cn ORGANIZATION ?= library REPOSITORY ?= golang -TAG ?= 1.25-alpine +GOMAJOR ?= 1.25 +GOMINOR ?= 11 +OSVERSION ?= alpine +TAG ?= $(GOMAJOR)-$(OSVERSION) -IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +ALIAS0 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR)-$(OSVERSION) default: image image: - echo "ci test latest" - docker build \ - -t $(IMAGE) \ - . + docker build -t $(IMAGE) . -push: +push: alias docker push $(IMAGE) + docker push $(ALIAS0) + +alias: + docker tag $(IMAGE) $(ALIAS0) diff --git a/library/golang/1.25-buster/Dockerfile b/library/golang/1.25-buster/Dockerfile index f410284d..d9dc6869 100644 --- a/library/golang/1.25-buster/Dockerfile +++ b/library/golang/1.25-buster/Dockerfile @@ -15,11 +15,11 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV PATH /usr/local/go/bin:$PATH -ENV GOLANGVERSION 1.25.5 +ENV GOLANGVERSION 1.25.11 RUN set -eux; \ - url='http://ftp.loongnix.cn/toolchain/golang/go-1.25/abi1.0/go1.25.5.linux-loong64.tar.gz'; \ - sha256='94b18b1253d303268f382222a13df33fd209883572dcf508df57144d05416b1a'; \ + url='http://ftp.loongnix.cn/toolchain/golang/go-1.25/abi1.0/go1.25.11.linux-loong64.tar.gz'; \ + sha256='ec78e8ab40288262c26d323d91f3f1daf4afce57c0316f063167cefb6264dd39'; \ wget -O go.tgz "$url" --progress=dot:giga; \ echo "$sha256 *go.tgz" | sha256sum -c -; \ tar -C /usr/local -xzf go.tgz; \ diff --git a/library/golang/1.25-buster/Makefile b/library/golang/1.25-buster/Makefile index ab11cda5..859dd6cc 100644 --- a/library/golang/1.25-buster/Makefile +++ b/library/golang/1.25-buster/Makefile @@ -3,11 +3,18 @@ REGISTRY ?= cr.loongnix.cn ORGANIZATION ?= library REPOSITORY ?= golang -TAG ?= 1.25-buster +GOMAJOR ?= 1.25 +GOMINOR ?= 11 +OSVERSION ?= buster +TAG ?= $(GOMAJOR)-$(OSVERSION) -IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) -ALIAS = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):1.25 -LATEST = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):latest + + +IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +ALIAS0 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR) +ALIAS1 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR)-$(OSVERSION) +ALIAS2 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR) +LATEST = default: image @@ -16,7 +23,9 @@ image: push: alias docker push $(IMAGE) - docker push $(ALIAS) + docker push $(ALIAS0) + docker push $(ALIAS1) + docker push $(ALIAS2) ifneq ($(LATEST),) docker tag $(IMAGE) $(LATEST) @@ -24,4 +33,6 @@ ifneq ($(LATEST),) endif alias: - docker tag $(IMAGE) $(ALIAS) + docker tag $(IMAGE) $(ALIAS0) + docker tag $(IMAGE) $(ALIAS1) + docker tag $(IMAGE) $(ALIAS2) diff --git a/library/golang/1.26-alpine/Dockerfile b/library/golang/1.26-alpine/Dockerfile index c3bc1854..97d8f0f1 100644 --- a/library/golang/1.26-alpine/Dockerfile +++ b/library/golang/1.26-alpine/Dockerfile @@ -10,11 +10,11 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV PATH /usr/local/go/bin:$PATH -ENV GOLANG_VERSION 1.26.0 +ENV GOLANG_VERSION 1.26.4 RUN set -eux; \ - url='https://ftp.loongnix.cn/toolchain/golang/go-1.26/abi1.0/go1.26.0.linux-loong64.tar.gz'; \ - sha256='f1225f07ed94fb9c83301b2abaf14306a0c3e0cc31f273bcba6d3e5b71293a4d'; \ + url='http://ftp.loongnix.cn/toolchain/golang/go-1.26/abi1.0/go1.26.4.linux-loong64.tar.gz'; \ + sha256='a71684bf759ac162040f8e7cd617d0c6ed4725b55b5276cfeb367d3ab210e0e1'; \ wget -O go.tgz "$url" --progress=dot:giga; \ echo "$sha256 *go.tgz" | sha256sum -c -; \ tar -C /usr/local -xzf go.tgz; \ diff --git a/library/golang/1.26-alpine/Makefile b/library/golang/1.26-alpine/Makefile index 981fc9bc..666c70b0 100644 --- a/library/golang/1.26-alpine/Makefile +++ b/library/golang/1.26-alpine/Makefile @@ -3,16 +3,22 @@ REGISTRY ?= cr.loongnix.cn ORGANIZATION ?= library REPOSITORY ?= golang -TAG ?= 1.26-alpine +GOMAJOR ?= 1.26 +GOMINOR ?= 4 +OSVERSION ?= alpine +TAG ?= $(GOMAJOR)-$(OSVERSION) -IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +ALIAS0 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR)-$(OSVERSION) default: image image: - docker build \ - -t $(IMAGE) \ - . + docker build -t $(IMAGE) . -push: +push: alias docker push $(IMAGE) + docker push $(ALIAS0) + +alias: + docker tag $(IMAGE) $(ALIAS0) diff --git a/library/golang/1.26-buster/Dockerfile b/library/golang/1.26-buster/Dockerfile new file mode 100644 index 00000000..54c2f362 --- /dev/null +++ b/library/golang/1.26-buster/Dockerfile @@ -0,0 +1,32 @@ +FROM cr.loongnix.cn/library/buildpack-deps:buster-scm + +# install cgo-related dependencies +RUN set -eux; \ + apt-get update; \ + apt-get dist-upgrade -y; \ + apt-get install -y --no-install-recommends \ + g++ \ + gcc \ + libc6-dev \ + make \ + pkg-config \ + ; \ + apt-get autoclean all; \ + rm -rf /var/lib/apt/lists/* + +ENV PATH /usr/local/go/bin:$PATH +ENV GOLANGVERSION 1.26.4 + +RUN set -eux; \ + url='http://ftp.loongnix.cn/toolchain/golang/go-1.26/abi1.0/go1.26.4.linux-loong64.tar.gz'; \ + sha256='a71684bf759ac162040f8e7cd617d0c6ed4725b55b5276cfeb367d3ab210e0e1'; \ + wget -O go.tgz "$url" --progress=dot:giga; \ + echo "$sha256 *go.tgz" | sha256sum -c -; \ + tar -C /usr/local -xzf go.tgz; \ + rm go.tgz; \ + go version + +ENV GOPATH /go +ENV PATH $GOPATH/bin:$PATH +RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" +WORKDIR $GOPATH diff --git a/library/golang/1.26-buster/Makefile b/library/golang/1.26-buster/Makefile new file mode 100644 index 00000000..9612efce --- /dev/null +++ b/library/golang/1.26-buster/Makefile @@ -0,0 +1,36 @@ +# This file is generated by the template. + +REGISTRY ?= cr.loongnix.cn +ORGANIZATION ?= library +REPOSITORY ?= golang +GOMAJOR ?= 1.26 +GOMINOR ?= 4 +OSVERSION ?= buster +TAG ?= $(GOMAJOR)-$(OSVERSION) + +IMAGE = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG) +ALIAS0 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR) +ALIAS1 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR)-$(OSVERSION) +ALIAS2 = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(GOMAJOR).$(GOMINOR) +LATEST = $(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):latest + +default: image + +image: + docker build -t $(IMAGE) . + +push: alias + docker push $(IMAGE) + docker push $(ALIAS0) + docker push $(ALIAS1) + docker push $(ALIAS2) + +ifneq ($(LATEST),) + docker tag $(IMAGE) $(LATEST) + docker push $(LATEST) +endif + +alias: + docker tag $(IMAGE) $(ALIAS0) + docker tag $(IMAGE) $(ALIAS1) + docker tag $(IMAGE) $(ALIAS2)