Skip to content

Commit 17f8312

Browse files
fix: 修正版本号
1 parent 36b1267 commit 17f8312

5 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ jobs:
1717
id: get-version
1818
run: |
1919
DOCKER_VERSION=$(curl -s "https://api.github.com/repos/moby/moby/releases/latest" | jq -r ".tag_name")
20+
# docker-v29.0.0 --> v29.0.0
21+
DOCKER_VERSION=${DOCKER_VERSION#*-}
22+
2023
if [ -z "$DOCKER_VERSION" ] || [ "$DOCKER_VERSION" == "null" ]; then
2124
echo "Failed to get latest version"
2225
exit 1

anolis-23/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FROM ghcr.io/loong64/${GO_IMAGE} AS golang
99

1010
FROM ghcr.io/loong64/${BUILD_IMAGE}
1111
ENV GOPROXY=https://proxy.golang.org|direct
12-
ENV GO111MODULE=off
12+
ENV GO111MODULE=on
1313
ENV GOPATH=/go
1414
ENV GOTOOLCHAIN=local
1515
ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin

binaries/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN make; \
4949

5050
WORKDIR /go/src/github.com/docker
5151
RUN set -ex; \
52-
git clone -b ${DOCKER_VERSION} https://github.com/moby/moby docker --depth=1
52+
git clone -b docker-${DOCKER_VERSION} https://github.com/moby/moby docker --depth=1
5353

5454
WORKDIR /go/src/github.com/docker/docker
5555
RUN mkdir bin; \

build-docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ sed -i 's@docker build @docker buildx build --load @g' deb/Makefile
8484

8585
if [ "${BUILD_DEB}" = '1' ]; then
8686
sed -i 's@FROM @FROM ghcr.io/loong64/@g' deb/debian-trixie/Dockerfile
87-
make ARCH=loong64 ARCHES=loong64 REF=${REF} VERSION=${VERSION} GO_VERSION=${GO_VERSION} GO_IMAGE=${GO_IMAGE} debian-trixie
87+
make ARCH=loong64 ARCHES=loong64 VERSION=${VERSION} REF=${REF} DOCKER_ENGINE_REF=docker-${REF} GO_VERSION=${GO_VERSION} GO_IMAGE=${GO_IMAGE} debian-trixie
8888
fi
8989
if [ "${BUILD_RPM}" = '1' ]; then
90-
make ARCH=loong64 ARCHES=loong64 REF=${REF} VERSION=${VERSION} GO_VERSION=${GO_VERSION} GO_IMAGE=${GO_IMAGE} fedora-41
90+
make ARCH=loong64 ARCHES=loong64 VERSION=${VERSION} REF=${REF} DOCKER_ENGINE_REF=docker-${REF} GO_VERSION=${GO_VERSION} GO_IMAGE=${GO_IMAGE} fedora-41
9191
fi
9292

9393
popd || exit 1

opencloudos-23/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FROM ghcr.io/loong64/${GO_IMAGE} AS golang
99

1010
FROM ghcr.io/loong64/${BUILD_IMAGE}
1111
ENV GOPROXY=https://proxy.golang.org|direct
12-
ENV GO111MODULE=off
12+
ENV GO111MODULE=on
1313
ENV GOPATH=/go
1414
ENV GOTOOLCHAIN=local
1515
ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin

0 commit comments

Comments
 (0)