Skip to content

Commit

Permalink
Switch image 6 be based on cimg/base
Browse files Browse the repository at this point in the history
  • Loading branch information
toini committed Sep 1, 2023
1 parent 928284d commit ec9e33c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
19 changes: 10 additions & 9 deletions 6/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0

# Check latest version at https://api.github.com/repos/docker/cli/tags
ENV DOCKER_VERSION 20.10.22
FROM cimg/base:current

RUN set -x && \
apt-get update && \
apt-get -y install unzip jq gettext-base
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

RUN sudo apt-get update && \
sudo apt-get -y install gettext-base dotnet-sdk-6.0

RUN 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
RUN dotnet tool install -g trx2junit
ENV PATH="${PATH}:/home/circleci/.dotnet/tools"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ List of image tags:

| Tag | Based on | Description |
| :---: | :---: | :---: |
| 6 | mcr.microsoft.com/dotnet/sdk:6.0 | Deprecated |
| 6 | cimg/base:current | Circle CI base image with .NET `dotnet-sdk-6.0` installed. 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. Supports buildx used by `aws-ecr` orb. |

0 comments on commit ec9e33c

Please sign in to comment.