From 31827c8d993b2537b4a4f03e708e7e5630cf3075 Mon Sep 17 00:00:00 2001 From: pande Date: Tue, 23 Sep 2025 15:57:48 +0800 Subject: [PATCH] fix: update Dockerfile to use Ubuntu base image and correct orchestrating script path --- .github/workflows/orchestratorci.yml | 2 +- orchestrator/Dockerfile | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/orchestratorci.yml b/.github/workflows/orchestratorci.yml index 05a9822..f884907 100644 --- a/.github/workflows/orchestratorci.yml +++ b/.github/workflows/orchestratorci.yml @@ -43,4 +43,4 @@ jobs: DO_TOKEN: ${{ secrets.DO_TOKEN }} SSH_PRIVATE_KEY_DECODED: ${{ secrets.SSH_PRIVATE_KEY_DECODED }} run: | - orchestrating.sh \ No newline at end of file + orchestrating \ No newline at end of file diff --git a/orchestrator/Dockerfile b/orchestrator/Dockerfile index 1e5f15c..5e9420f 100644 --- a/orchestrator/Dockerfile +++ b/orchestrator/Dockerfile @@ -1,10 +1,16 @@ -FROM alpine:latest -RUN apk --no-cache add curl bash git doctl openssh +FROM catthehacker/ubuntu:runner-24.04 +USER root +RUN apt-get update && apt-get install -y curl bash git wget openssh-client -WORKDIR /root +RUN wget https://github.com/digitalocean/doctl/releases/download/v1.141.0/doctl-1.141.0-linux-amd64.tar.gz \ + && tar -xvf doctl-1.141.0-linux-amd64.tar.gz \ + && mv doctl /usr/local/bin \ + && rm doctl-1.141.0-linux-amd64.tar.gz -COPY orchestrating.sh /usr/local/bin/orchestrating.sh -COPY cleanup.sh /usr/local/bin/cleanup.sh -RUN chmod 755 /usr/local/bin/orchestrating.sh /usr/local/bin/cleanup.sh +COPY orchestrating.sh /usr/local/bin/orchestrating +COPY cleanup.sh /usr/local/bin/cleanup +RUN chmod 755 /usr/local/bin/orchestrating /usr/local/bin/cleanup + +USER act CMD ["tail" ,"-f" ,"/dev/null"] \ No newline at end of file