Skip to content

Commit a02965e

Browse files
committed
Miscellaneous improvements
* Dockerfile.almalinux Dockerfile.ubuntu - Use main branch of action-runners - for now * build-files/build-image.sh - Remove /home/ubuntu/.nuget to free >2GB as it was only there for action runners build
1 parent 8dcbf85 commit a02965e

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

Dockerfile.almalinux

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ COPY ${RUNNERPATCH} /tmp/runner.patch
1414
RUN cd /tmp && \
1515
git clone -q ${RUNNERREPO} && \
1616
cd runner && \
17-
git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b build && \
18-
git apply /tmp/runner.patch && \
19-
sed -i'' -e 's/"version": "8[^"]*"/"version": "'${SDK_VERSION}'"/' src/global.json && \
20-
sed -i'' -e 's/"version": "8[^"]*"/"version": "'${SDK_VERSION}'"/' .devcontainer/devcontainer.json && \
21-
sed -i'' -e 's/DOTNETSDK_VERSION="8[^"]*"/DOTNETSDK_VERSION="'${SDK_VERSION}'"/' src/dev.sh
17+
git checkout main -b build && \
18+
# git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b build && \
19+
sed -i'' -e /version/s/8......\"$/${SDK}.0.100\"/ src/global.json && \
20+
git apply /tmp/runner.patch
2221

2322
RUN cd /tmp/runner/src && \
2423
./dev.sh layout && \

Dockerfile.ubuntu

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.10
22

33
ARG RUNNERREPO="https://github.com/actions/runner" RUNNERPATCH SDK_VERSION ARCH
44

55
ENV DEBIAN_FRONTEND=noninteractive
66

77
RUN apt-get -qq update -y && \
8-
apt-get -qq -y install wget git sudo alien curl && \
8+
apt-get -qq -y install wget git sudo curl dotnet-sdk-8.0 && \
99
apt autoclean
1010

11-
RUN apt-get -qq -y install dotnet-sdk-8.0 && \
12-
SDK_VERSION=`dotnet --version` && \
13-
echo "Using SDK - ${SDK_VERSION}"
11+
RUN echo "Using SDK - `dotnet --version`"
1412

1513
ADD ${RUNNERPATCH} /tmp/runner.patch
1614

build-files/build-image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ install_runner() {
9292

9393
cleanup() {
9494
rm -rf /home/ubuntu/build-image.sh /home/ubuntu/runner-sdk-8.patch \
95-
/tmp/runner /tmp/preseed-yaml
95+
/tmp/runner /tmp/preseed-yaml /home/ubuntu/.nuget
9696
}
9797

9898
run() {

0 commit comments

Comments
 (0)