From 3ed91d7310c59a2ba4406bafdd7cd65f6106b21c Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 10 Oct 2024 11:54:42 +0200 Subject: [PATCH] Bumps containers to dotnet 8.0 --- README.md | 2 +- Tools/AutoClient/README.md | 2 +- Tools/AutoClient/docker/Dockerfile | 2 +- Tools/BiblioTech/docker/Dockerfile | 2 +- Tools/KeyMaker/docker/Dockerfile | 2 +- Tools/TestNetRewarder/docker/Dockerfile | 2 +- Tools/TranscriptAnalysis/Program.cs | 2 -- docker/Dockerfile | 2 +- docker/deployandrun.Dockerfile | 2 +- docs/Automation.md | 2 +- docs/Continuous-Tests.md | 2 +- docs/LOCALSETUP.md | 2 +- 12 files changed, 11 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index eaefe4f..4d1e676 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This project allows you to write tools and tests that control and interact with container-based applications to form a distributed system in a controlled, reproducible environment. -Dotnet: v7.0 +Dotnet: v8.0 Kubernetes: v1.25.4 Dotnet-kubernetes SDK: v10.1.4 https://github.com/kubernetes-client/csharp Nethereum: v4.14.0 diff --git a/Tools/AutoClient/README.md b/Tools/AutoClient/README.md index 3429350..8146126 100644 --- a/Tools/AutoClient/README.md +++ b/Tools/AutoClient/README.md @@ -6,7 +6,7 @@ Can generate random images or random data of a specified size. ## How to run -- dotnet 7.0 and CLI arguments: `dotnet run -- --codex-host=... --codex-port=...` +- dotnet 8.0 and CLI arguments: `dotnet run -- --codex-host=... --codex-port=...` - docker and env-vars: `codexstorage/codex-autoclient:sha-88daab3` ## Configuration options diff --git a/Tools/AutoClient/docker/Dockerfile b/Tools/AutoClient/docker/Dockerfile index a1436c2..713421d 100644 --- a/Tools/AutoClient/docker/Dockerfile +++ b/Tools/AutoClient/docker/Dockerfile @@ -1,5 +1,5 @@ # Variables -ARG BUILDER=mcr.microsoft.com/dotnet/sdk:7.0 +ARG BUILDER=mcr.microsoft.com/dotnet/sdk:8.0 ARG IMAGE=${BUILDER} ARG APP_HOME=/app diff --git a/Tools/BiblioTech/docker/Dockerfile b/Tools/BiblioTech/docker/Dockerfile index c1072dc..98887e1 100644 --- a/Tools/BiblioTech/docker/Dockerfile +++ b/Tools/BiblioTech/docker/Dockerfile @@ -1,5 +1,5 @@ # Variables -ARG BUILDER=mcr.microsoft.com/dotnet/sdk:7.0 +ARG BUILDER=mcr.microsoft.com/dotnet/sdk:8.0 ARG IMAGE=${BUILDER} ARG APP_HOME=/app diff --git a/Tools/KeyMaker/docker/Dockerfile b/Tools/KeyMaker/docker/Dockerfile index 74d929b..c7a4234 100644 --- a/Tools/KeyMaker/docker/Dockerfile +++ b/Tools/KeyMaker/docker/Dockerfile @@ -1,5 +1,5 @@ # Variables -ARG BUILDER=mcr.microsoft.com/dotnet/sdk:7.0 +ARG BUILDER=mcr.microsoft.com/dotnet/sdk:8.0 ARG IMAGE=${BUILDER} ARG APP_HOME=/app diff --git a/Tools/TestNetRewarder/docker/Dockerfile b/Tools/TestNetRewarder/docker/Dockerfile index 49f56e2..4a24161 100644 --- a/Tools/TestNetRewarder/docker/Dockerfile +++ b/Tools/TestNetRewarder/docker/Dockerfile @@ -1,5 +1,5 @@ # Variables -ARG BUILDER=mcr.microsoft.com/dotnet/sdk:7.0 +ARG BUILDER=mcr.microsoft.com/dotnet/sdk:8.0 ARG IMAGE=${BUILDER} ARG APP_HOME=/app diff --git a/Tools/TranscriptAnalysis/Program.cs b/Tools/TranscriptAnalysis/Program.cs index 7f67aef..289d70b 100644 --- a/Tools/TranscriptAnalysis/Program.cs +++ b/Tools/TranscriptAnalysis/Program.cs @@ -9,8 +9,6 @@ public static class Program public static void Main(string[] args) { - //args = new[] { "D:\\Projects\\cs-codex-dist-tests\\Tests\\CodexTests\\bin\\Debug\\net7.0\\CodexTestLogs\\2024-08\\06\\08-24-45Z_ThreeClientTest\\SwarmTest_SwarmTest.owts" }; - Log("Transcript Analysis"); if (!args.Any()) { diff --git a/docker/Dockerfile b/docker/Dockerfile index 606a07f..07a9123 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 +FROM mcr.microsoft.com/dotnet/sdk:8.0 COPY --chmod=0755 docker/docker-entrypoint.sh / diff --git a/docker/deployandrun.Dockerfile b/docker/deployandrun.Dockerfile index 869f017..3d59328 100644 --- a/docker/deployandrun.Dockerfile +++ b/docker/deployandrun.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 +FROM mcr.microsoft.com/dotnet/sdk:8.0 RUN apt-get update && apt-get install -y screen WORKDIR /app diff --git a/docs/Automation.md b/docs/Automation.md index 2806501..ee00152 100644 --- a/docs/Automation.md +++ b/docs/Automation.md @@ -104,7 +104,7 @@ GitHub --> CI --> Kubernetes --> Job | spec: containers: - name: dotnet - image: mcr.microsoft.com/dotnet/sdk:7.0 + image: mcr.microsoft.com/dotnet/sdk:8.0 env: - name: RUNNERLOCATION value: InternalToCluster diff --git a/docs/Continuous-Tests.md b/docs/Continuous-Tests.md index a46dcbc..16518c2 100644 --- a/docs/Continuous-Tests.md +++ b/docs/Continuous-Tests.md @@ -44,7 +44,7 @@ spec: containers: - name: runner - image: mcr.microsoft.com/dotnet/sdk:7.0 + image: mcr.microsoft.com/dotnet/sdk:8.0 env: - name: KUBECONFIG value: /opt/kubeconfig.yaml diff --git a/docs/LOCALSETUP.md b/docs/LOCALSETUP.md index ad65c0e..40126a1 100644 --- a/docs/LOCALSETUP.md +++ b/docs/LOCALSETUP.md @@ -4,7 +4,7 @@ These steps will help you set up everything you need to run and debug the tests on your local system. ### Installing the requirements. -1. Install dotnet v7.0 or newer. (If you install a newer version, consider updating the .csproj files by replacing all mention of `net7.0` with your version.) +1. Install dotnet v8.0 or newer. (If you install a newer version, consider updating the .csproj files by replacing all mention of `net8.0` with your version.) 1. Set up a nice C# IDE or plugin for your current IDE. 1. Install docker desktop. 1. In the docker-desktop settings, enable kubernetes. (This might take a few minutes.)