From 3ee8ce66b3f25d7986d8c108d64ac29ddfa74a43 Mon Sep 17 00:00:00 2001 From: Toni Juvani Date: Wed, 19 Nov 2025 10:11:18 +0200 Subject: [PATCH 1/2] Clean up Dockerfiles for 6, 7, 7-alpine --- 6/99microsoft-dotnet.pref | 3 --- 6/Dockerfile | 18 ------------------ 7-alpine/Dockerfile | 14 -------------- 7/99microsoft-dotnet.pref | 3 --- 7/Dockerfile | 20 -------------------- README.md | 3 --- 6 files changed, 61 deletions(-) delete mode 100644 6/99microsoft-dotnet.pref delete mode 100644 6/Dockerfile delete mode 100644 7-alpine/Dockerfile delete mode 100644 7/99microsoft-dotnet.pref delete mode 100644 7/Dockerfile diff --git a/6/99microsoft-dotnet.pref b/6/99microsoft-dotnet.pref deleted file mode 100644 index 6e6048b..0000000 --- a/6/99microsoft-dotnet.pref +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: origin "packages.microsoft.com" -Pin-Priority: 1001 diff --git a/6/Dockerfile b/6/Dockerfile deleted file mode 100644 index 9fdffa8..0000000 --- a/6/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM cimg/base:current@sha256:f9e54a98a858e43aaa025a78fe62857d309dce4444f3d346dc281a2593d5d815 - -RUN set -x && \ - repo_version=$(if command -v lsb_release >/dev/null 2>&1; then lsb_release -r -s; else grep -oP '(?<=^VERSION_ID=).+' /etc/os-release | tr -d '"'; fi) && \ - wget https://packages.microsoft.com/config/ubuntu/$repo_version/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \ - sudo dpkg -i packages-microsoft-prod.deb && \ - rm packages-microsoft-prod.deb - -# Use Microsoft packages instead of Ubuntu so we can later install trx2unit -COPY 99microsoft-dotnet.pref /etc/apt/preferences.d - -RUN sudo apt-get update && \ - sudo apt-get -y install gettext-base dotnet-sdk-6.0 - -# Install trx2junit to be used during build -RUN dotnet tool install -g trx2junit - -ENV PATH="${PATH}:/home/circleci/.dotnet/tools" diff --git a/7-alpine/Dockerfile b/7-alpine/Dockerfile deleted file mode 100644 index 47dafb6..0000000 --- a/7-alpine/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine@sha256:1478c99b4bed8d297ccd000e0fdaf060cdfb281779f8c8aa47f031a09503c0d4 - -# Check latest version at https://api.github.com/repos/docker/cli/tags -ENV DOCKER_VERSION 23.0.1 - -RUN set -x && \ - apk update && apk add aws-cli jq gettext bash build-base && \ - curl -L -o /tmp/docker-$DOCKER_VERSION.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_VERSION.tgz && \ - tar -xz -C /tmp -f /tmp/docker-$DOCKER_VERSION.tgz && \ - mv /tmp/docker/* /usr/bin && \ - dotnet tool install -g trx2junit - -ENV PATH="${PATH}:/root/.dotnet/tools" - diff --git a/7/99microsoft-dotnet.pref b/7/99microsoft-dotnet.pref deleted file mode 100644 index 6e6048b..0000000 --- a/7/99microsoft-dotnet.pref +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: origin "packages.microsoft.com" -Pin-Priority: 1001 diff --git a/7/Dockerfile b/7/Dockerfile deleted file mode 100644 index c83afeb..0000000 --- a/7/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM cimg/base:current@sha256:f9e54a98a858e43aaa025a78fe62857d309dce4444f3d346dc281a2593d5d815 - -RUN set -x && \ - repo_version=$(if command -v lsb_release >/dev/null 2>&1; then lsb_release -r -s; else grep -oP '(?<=^VERSION_ID=).+' /etc/os-release | tr -d '"'; fi) && \ - wget https://packages.microsoft.com/config/ubuntu/$repo_version/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \ - sudo dpkg -i packages-microsoft-prod.deb && \ - rm packages-microsoft-prod.deb - -# Use Microsoft packages instead of Ubuntu so we can later install trx2unit -COPY 99microsoft-dotnet.pref /etc/apt/preferences.d - -RUN sudo apt-get update && \ - sudo apt-get -y install gettext-base dotnet-sdk-7.0 - -# Install trx2junit to be used during build -RUN dotnet tool install -g trx2junit - -ENV PATH="${PATH}:/home/circleci/.dotnet/tools" - -RUN curl -Ls https://download.newrelic.com/install/newrelic-cli/scripts/install.sh | bash diff --git a/README.md b/README.md index 0f18546..9d9c925 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,6 @@ List of image tags: | Tag | Based on | Description | | :---: | :---: | :---: | -| 6 | cimg/base:current | Circle CI base image with .NET `dotnet-sdk-6.0` installed from Microsofts's package repository. Supports buildx used by `aws-ecr` orb. | -| 7-alpine | mcr.microsoft.com/dotnet/sdk:7.0-alpine | Microsoft Alpine image with Docker installed. Does not support Docker buildx / Buildkit. | -| 7 | cimg/base:current | Circle CI base image with .NET `dotnet-sdk-7.0` installed from Microsofts's package repository. Supports buildx used by `aws-ecr` orb. | | 8 | cimg/base:current | Circle CI base image with .NET `dotnet-sdk-8.0` installed from Microsofts's package repository. Supports buildx used by `aws-ecr` orb. | | 9 | cimg/base:current | Circle CI base image with .NET `dotnet-sdk-9.0` installed from Ubuntu's package repository (backport ppa needed for 22.04). Supports buildx used by `aws-ecr` orb. | | 10 | cimg/base:current | Circle CI base image with .NET SDK 10.0 installed via `dotnet-install.sh` w/ signature verification. Supports buildx used by `aws-ecr` orb. | From 35753e1b377a850feccdc231a6448581a0d09565 Mon Sep 17 00:00:00 2001 From: Toni Juvani Date: Wed, 19 Nov 2025 10:56:18 +0200 Subject: [PATCH 2/2] Remove validation intended for private repos --- .github/workflows/validate-repo.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .github/workflows/validate-repo.yml diff --git a/.github/workflows/validate-repo.yml b/.github/workflows/validate-repo.yml deleted file mode 100644 index 74dfd02..0000000 --- a/.github/workflows/validate-repo.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Tibber Repo Validator - -on: - push: - branches: - - main - - master - pull_request: - -jobs: - validation: - uses: tibber/github-actions/.github/workflows/validate-repo.yaml@main