opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #792 from trheyi/main

Browse source 
Update build-linux.yml and Dockerfile for environment improvements an…
This commit is contained in:
Max 2024-11-29 13:37:33 +08:00 • committed by GitHub
commit b0b70a8e1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/build-linux.yml vendored
View file

@ -19,11 +19,6 @@ jobs:
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }} R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
steps: steps:
- name: Install AWS CLI
run: |
apt-get update
apt-get install -y awscli
- name: Configure R2 For Cloudflare - name: Configure R2 For Cloudflare
run: | run: |
aws configure set aws_access_key_id $CF_ACCESS_KEY_ID aws configure set aws_access_key_id $CF_ACCESS_KEY_ID

22
docker/build/Dockerfile
View file

@ -1,5 +1,5 @@
# =========================================== # ===========================================
# Yao Build Environment (Ubuntu 23.04 AMD64) # Yao Build Environment (Ubuntu 24.04 AMD64)
# #
# Build: # Build:
# docker build --platform linux/amd64 -t yaoapp/yao-build:0.10.4 . # docker build --platform linux/amd64 -t yaoapp/yao-build:0.10.4 .
@ -12,7 +12,7 @@
# docker run --rm -it -v ./test:/data yaoapp/yao-build:0.10.4 /bin/bash # docker run --rm -it -v ./test:/data yaoapp/yao-build:0.10.4 /bin/bash
# #
# =========================================== # ===========================================
FROM ubuntu:23.04 FROM ubuntu:24.04
WORKDIR /app WORKDIR /app
ADD build.sh /app/build.sh ADD build.sh /app/build.sh
ENV PATH=$PATH:/usr/local/go/bin:/root/go/bin ENV PATH=$PATH:/usr/local/go/bin:/root/go/bin
@ -29,18 +29,24 @@ RUN apt-get update && \
apt-get install -y git && \ apt-get install -y git && \
apt-get install -y unzip apt-get install -y unzip
RUN wget https://golang.org/dl/go1.21.1.linux-amd64.tar.gz && \ # Install Go 1.23.3
tar -C /usr/local -xzf go1.21.1.linux-amd64.tar.gz && \ RUN wget https://golang.org/dl/go1.23.3.linux-amd64.tar.gz && \
rm go1.21.1.linux-amd64.tar.gz tar -C /usr/local -xzf go1.23.3.linux-amd64.tar.gz && \
rm go1.23.3.linux-amd64.tar.gz
# Install Node.js 18.x
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
apt-get install -y nodejs apt-get install -y nodejs
RUN npm install -g pnpm RUN npm install -g pnpm
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \ # Install AWS CLI
apt-get install -y git-lfs && \ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
git lfs install unzip awscliv2.zip && \
./aws/install && \
rm -rf awscliv2.zip && \
rm -rf aws && \
aws --version
# RUN npm install -g pnpm # RUN npm install -g pnpm
RUN chmod +x /app/build.sh RUN chmod +x /app/build.sh