Compare commits

..

1 Commits

Author SHA1 Message Date
Bassem Dghaidi
1c48dad21d Switch to ubuntu-22.04 base image 2023-06-08 09:45:39 -04:00
5 changed files with 10 additions and 8 deletions

View File

@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 as build # Source: https://github.com/dotnet/dotnet-docker
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build
ARG RUNNER_VERSION ARG RUNNER_VERSION
ARG RUNNER_ARCH="x64" ARG RUNNER_ARCH="x64"
@@ -8,7 +9,7 @@ ARG DOCKER_VERSION=20.10.23
RUN apt update -y && apt install curl unzip -y RUN apt update -y && apt install curl unzip -y
WORKDIR /actions-runner WORKDIR /actions-runner
RUN curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \ RUN curl -f -L -o runner.tar.gz https://github.com/nebuchadnezzar-corp/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \
&& tar xzf ./runner.tar.gz \ && tar xzf ./runner.tar.gz \
&& rm runner.tar.gz && rm runner.tar.gz
@@ -22,7 +23,7 @@ RUN export DOCKER_ARCH=x86_64 \
&& tar zxvf docker.tgz \ && tar zxvf docker.tgz \
&& rm -rf docker.tgz && rm -rf docker.tgz
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV RUNNER_MANUALLY_TRAP_SIG=1 ENV RUNNER_MANUALLY_TRAP_SIG=1
@@ -31,6 +32,7 @@ ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1
RUN apt-get update -y \ RUN apt-get update -y \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
sudo \ sudo \
lsb-release \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN adduser --disabled-password --gecos "" --uid 1001 runner \ RUN adduser --disabled-password --gecos "" --uid 1001 runner \

View File

@@ -141,7 +141,7 @@ namespace GitHub.Runner.Worker
foreach (var error in templateContext.Errors) foreach (var error in templateContext.Errors)
{ {
Trace.Error($"Action.yml load error: {error.Message}"); Trace.Error($"Action.yml load error: {error.Message}");
executionContext.Error("And let's duplicate errors: " + error.Message); executionContext.Error(error.Message);
} }
throw new ArgumentException($"Fail to load {fileRelativePath}"); throw new ArgumentException($"Fail to load {fileRelativePath}");

View File

@@ -1401,7 +1401,7 @@ namespace GitHub.Runner.Worker
public void Error(string format, params Object[] args) public void Error(string format, params Object[] args)
{ {
_executionContext.Error("error from template trace writer: " + string.Format(CultureInfo.CurrentCulture, format, args)); _executionContext.Error(string.Format(CultureInfo.CurrentCulture, format, args));
} }
public void Info(string format, params Object[] args) public void Info(string format, params Object[] args)

View File

@@ -287,7 +287,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
{ {
if (!keys.Contains(property.Key)) if (!keys.Contains(property.Key))
{ {
m_context.Error(mapping, "Template evaluator error " + $"Required property is missing: {property.Key}"); m_context.Error(mapping, $"Required property is missing: {property.Key}");
} }
} }
} }

View File

@@ -279,7 +279,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
nonDuplicates.Sort(); nonDuplicates.Sort();
String listToDeDuplicate = String.Join(", ", nonDuplicates); String listToDeDuplicate = String.Join(", ", nonDuplicates);
m_context.Error(mapping, "Template reader error: " + TemplateStrings.UnableToDetermineOneOf(listToDeDuplicate)); m_context.Error(mapping, TemplateStrings.UnableToDetermineOneOf(listToDeDuplicate));
} }
else if (mappingDefinitions.Count == 1 && !hasExpressionKey) else if (mappingDefinitions.Count == 1 && !hasExpressionKey)
{ {
@@ -289,7 +289,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
{ {
if (!keys.Contains(property.Key)) if (!keys.Contains(property.Key))
{ {
m_context.Error(mapping, "Template Reader error " + $"Required property is missing: {property.Key}"); m_context.Error(mapping, $"Required property is missing: {property.Key}");
} }
} }
} }