From f58aea74590317f5b132f539259132e694f28396 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 20 Dec 2025 12:12:57 +0800 Subject: [PATCH] Update Dockerfiles and GitHub Actions to use version 1.0.0 - Updated the Dockerfiles and GitHub Actions workflows to reference version 1.0.0 of the Yao build environment and Go, ensuring compatibility with the latest features and improvements. - Adjusted the Go version in the macOS workflow and updated the Dockerfile to install Go 1.25.0, enhancing the build process. --- .github/workflows/build-linux.yml | 2 +- .github/workflows/build-macos.yml | 4 ++-- docker/build/Dockerfile | 16 ++++++++-------- docker/development/Dockerfile | 8 ++++---- docker/production/Dockerfile | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index d3371aed..2a2ad563 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: "ubuntu-latest" container: - image: yaoapp/yao-build:0.10.5 + image: yaoapp/yao-build:1.0.0 env: CF_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }} diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 4fff33de..abba7b72 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -7,13 +7,13 @@ on: description: "Version tags" env: - VERSION: 0.10.5 + VERSION: 1.0.0 jobs: build: strategy: matrix: - go: [1.24.3] + go: ["1.25"] runs-on: "macos-latest" steps: - name: Setup Node.js diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile index 9e1ff9e9..92ae1159 100644 --- a/docker/build/Dockerfile +++ b/docker/build/Dockerfile @@ -2,14 +2,14 @@ # Yao Build Environment (Ubuntu 24.04 AMD64) # # Build: -# docker build --platform linux/amd64 -t yaoapp/yao-build:0.10.5 . +# docker build --platform linux/amd64 -t yaoapp/yao-build:1.0.0 . # # Usage: -# docker run --rm -it -v /local/path/dist:/data yaoapp/yao-build:0.10.5 +# docker run --rm -it -v /local/path/dist:/data yaoapp/yao-build:1.0.0 # # Tests: -# docker run --rm -it yaoapp/yao-build:0.10.5 /bin/bash -# docker run --rm -it -v ./test:/data yaoapp/yao-build:0.10.5 /bin/bash +# docker run --rm -it yaoapp/yao-build:1.0.0 /bin/bash +# docker run --rm -it -v ./test:/data yaoapp/yao-build:1.0.0 /bin/bash # # =========================================== FROM ubuntu:24.04 @@ -29,10 +29,10 @@ RUN apt-get update && \ apt-get install -y git && \ apt-get install -y unzip -# Install Go 1.24.3 -RUN wget https://golang.org/dl/go1.24.3.linux-amd64.tar.gz && \ - tar -C /usr/local -xzf go1.24.3.linux-amd64.tar.gz && \ - rm go1.24.3.linux-amd64.tar.gz +# Install Go 1.25.0 +RUN wget https://golang.org/dl/go1.25.0.linux-amd64.tar.gz && \ + tar -C /usr/local -xzf go1.25.0.linux-amd64.tar.gz && \ + rm go1.25.0.linux-amd64.tar.gz # Install Node.js 18.x RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index e8ffc323..ef778e28 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -6,12 +6,12 @@ # -t yaoapp/yao-dev:${VERSION}-${ARCH} . # # Build: -# docker build --platform linux/amd64 --build-arg VERSION=0.9.1 --build-arg ARCH=amd64 -t yaoapp/yao:0.9.1-amd64-dev . -# docker build --platform linux/arm64 --build-arg VERSION=0.9.1 --build-arg ARCH=arm64 -t yaoapp/yao:0.9.1-arm64-dev . +# docker build --platform linux/amd64 --build-arg VERSION=1.0.0 --build-arg ARCH=amd64 -t yaoapp/yao:1.0.0-amd64-dev . +# docker build --platform linux/arm64 --build-arg VERSION=1.0.0 --build-arg ARCH=arm64 -t yaoapp/yao:1.0.0-arm64-dev . # # Tests: -# docker run --rm yaoapp/yao:0.9.1-amd64-dev yao version -# docker run -d -p 5099:5099 yaoapp/yao:0.9.1-amd64-dev +# docker run --rm yaoapp/yao:1.0.0-amd64-dev yao version +# docker run -d -p 5099:5099 yaoapp/yao:1.0.0-amd64-dev # # =========================================== FROM ubuntu:24.04 diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 8e788a80..68985492 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -3,15 +3,15 @@ # docker build \ # --build-arg VERSION="${VERSION}" \ # --build-arg ARCH="${ARCH}" \ -# -t yaoapp/yao-dev:${VERSION}-${ARCH} . +# -t yaoapp/yao:${VERSION}-${ARCH} . # # Build: -# docker build --platform linux/amd64 --build-arg VERSION=0.9.1 --build-arg ARCH=amd64 -t yaoapp/yao:0.9.1-amd64 . -# docker build --platform linux/arm64 --build-arg VERSION=0.9.1 --build-arg ARCH=arm64 -t yaoapp/yao:0.9.1-arm64 . +# docker build --platform linux/amd64 --build-arg VERSION=1.0.0 --build-arg ARCH=amd64 -t yaoapp/yao:1.0.0-amd64 . +# docker build --platform linux/arm64 --build-arg VERSION=1.0.0 --build-arg ARCH=arm64 -t yaoapp/yao:1.0.0-arm64 . # # Tests: -# docker run --rm yaoapp/yao:0.9.1-amd64 yao version -# docker run -d -p 5099:5099 yaoapp/yao:0.9.1-amd64 +# docker run --rm yaoapp/yao:1.0.0-amd64 yao version +# docker run -d -p 5099:5099 yaoapp/yao:1.0.0-amd64 # # =========================================== FROM alpine:latest