From 6686203a998e2ab723aed077142cbece78442406 Mon Sep 17 00:00:00 2001 From: tleijten Date: Tue, 28 Nov 2023 15:25:14 +0100 Subject: [PATCH 1/4] feat: upgrade to NET 8 Upgrade to NET 8 --- CHANGELOG.md | 5 +++++ Dockerfile | 5 ++++- package-lock.json | 13 +++++++++++++ package.json | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 package-lock.json diff --git a/CHANGELOG.md b/CHANGELOG.md index d366a78..4c722ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [11.0.0] + +- [BREAKING] Updated to NET 8 SDK container +- Added NET 7 runtime so NET 7 projects can still run (for example the multi target nuget package tests) + ## [10.0.1] - Updated base image with patch version `7.0.404-1-bullseye-slim-amd64` diff --git a/Dockerfile b/Dockerfile index 39a9fd6..221ff60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,7 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0.404-1-bullseye-slim-amd64 +FROM mcr.microsoft.com/dotnet/sdk:8.0 + +# "install" the dotnet 7 runtime so we can also run the NET 7 tests +COPY --from=mcr.microsoft.com/dotnet/sdk:7.0 /usr/share/dotnet/shared /usr/share/dotnet/shared # install base software RUN mkdir -p /usr/share/man/man1 \ diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..cad4c77 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "dotnet-build", + "version": "11.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "dotnet-build", + "version": "11.0.0", + "license": "ISC" + } + } +} diff --git a/package.json b/package.json index 3c10544..64e9276 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dotnet-build", - "version": "10.0.1", + "version": "11.0.0", "description": "[![logo](./logo.jpg)](https://inforit.nl)", "main": "index.js", "scripts": { From ca9f5669f840e41180cde41886f0083187d41b8c Mon Sep 17 00:00:00 2001 From: tleijten Date: Tue, 28 Nov 2023 15:25:14 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=EF=BB=BFfeat:=20upgrade=20to=20NET=208?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upgrade to NET 8 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c722ac..72efca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [11.0.0] +- [BREAKING] Renamed Inforit to Frontliners - [BREAKING] Updated to NET 8 SDK container - Added NET 7 runtime so NET 7 projects can still run (for example the multi target nuget package tests) From 25c60e93cb18553f6c350cbcde98cb180d5752e6 Mon Sep 17 00:00:00 2001 From: tleijten Date: Wed, 29 Nov 2023 10:05:05 +0100 Subject: [PATCH 3/4] build: rename inforit to frontliners Changes nuget feed url --- LICENSE | 2 +- README.md | 4 ++-- dotnet-build.sh | 4 ++-- package.json | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/LICENSE b/LICENSE index 67dc4ce..5a9237c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 INFORIT +Copyright (c) 2019 FRONTLINERS Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 71e6655..372c6ee 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # bitbucket-pipelines dotnet-build -[![logo](./logo.jpg)](https://inforit.nl) +[![logo](./logo.jpg)](https://frontliners.nl) Docker image to automate dotnet builds @@ -28,7 +28,7 @@ Docker image to automate dotnet builds ## Usage ```sh -image: inforitnl/dotnet-build +image: frontliners/dotnet-build pipelines: default: diff --git a/dotnet-build.sh b/dotnet-build.sh index 8cec3b4..261f0fd 100644 --- a/dotnet-build.sh +++ b/dotnet-build.sh @@ -19,9 +19,9 @@ fi if [ -n "$MYGET_ACCESS_TOKEN" ]; then NUGET_CONFIG=~/.nuget/NuGet/NuGet.Config echo "Adding private myget source" - SOURCE="https://www.myget.org/F/inforit/auth/$MYGET_ACCESS_TOKEN/api/v3/index.json" + SOURCE="https://www.myget.org/F/frontliners/auth/$MYGET_ACCESS_TOKEN/api/v3/index.json" if ! grep -q "$SOURCE" $NUGET_CONFIG; then - VAR=$(sed "/<\/packageSources>/i " $NUGET_CONFIG) + VAR=$(sed "/<\/packageSources>/i " $NUGET_CONFIG) echo "$VAR" >$NUGET_CONFIG fi fi diff --git a/package.json b/package.json index 64e9276..5d13f02 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,22 @@ { "name": "dotnet-build", "version": "11.0.0", - "description": "[![logo](./logo.jpg)](https://inforit.nl)", + "description": "[![logo](./logo.jpg)](https://frontliners.nl)", "main": "index.js", "scripts": { - "build": "docker build -t inforitnl/dotnet-build .", - "tag": "docker tag inforitnl/dotnet-build", - "push": "docker push inforitnl/dotnet-build", - "publish": "DOCKER_PROD_TAG=$(cat package.json | grep version | head -1 | awk -F: '{ print $2}' | sed 's/[\",]//g' | tr -d '[[:space:]]') && docker build -t inforitnl/dotnet-build . && docker tag inforitnl/dotnet-build inforitnl/dotnet-build:latest && docker tag inforitnl/dotnet-build inforitnl/dotnet-build:$DOCKER_PROD_TAG && docker push inforitnl/dotnet-build:latest && docker push inforitnl/dotnet-build:$DOCKER_PROD_TAG" + "build": "docker build -t frontliners/dotnet-build .", + "tag": "docker tag frontliners/dotnet-build", + "push": "docker push frontliners/dotnet-build", + "publish": "DOCKER_PROD_TAG=$(cat package.json | grep version | head -1 | awk -F: '{ print $2}' | sed 's/[\",]//g' | tr -d '[[:space:]]') && docker build -t frontliners/dotnet-build . && docker tag frontliners/dotnet-build frontliners/dotnet-build:latest && docker tag frontliners/dotnet-build frontliners/dotnet-build:$DOCKER_PROD_TAG && docker push frontliners/dotnet-build:latest && docker push frontliners/dotnet-build:$DOCKER_PROD_TAG" }, "repository": { "type": "git", - "url": "git+https://github.com/Inforitnl/dotnet-build.git" + "url": "git+https://github.com/frontlinersnl/dotnet-build.git" }, "author": "Rick van Lieshout (http://rickvanlieshout.com)", "license": "ISC", "bugs": { - "url": "https://github.com/Inforitnl/dotnet-build/issues" + "url": "https://github.com/frontlinersnl/dotnet-build/issues" }, - "homepage": "https://github.com/Inforitnl/dotnet-build#readme" + "homepage": "https://github.com/frontlinersnl/dotnet-build#readme" } \ No newline at end of file From 8a41112b01af52aaf16a6e6f82e8848516cc24cd Mon Sep 17 00:00:00 2001 From: tleijten Date: Tue, 5 Dec 2023 10:46:46 +0100 Subject: [PATCH 4/4] fix: target specific image version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 221ff60..5edaa40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 +FROM mcr.microsoft.com/dotnet/sdk:8.0.100-1-bookworm-slim-amd64 # "install" the dotnet 7 runtime so we can also run the NET 7 tests -COPY --from=mcr.microsoft.com/dotnet/sdk:7.0 /usr/share/dotnet/shared /usr/share/dotnet/shared +COPY --from=mcr.microsoft.com/dotnet/sdk:7.0.404-1-bookworm-slim-amd64 /usr/share/dotnet/shared /usr/share/dotnet/shared # install base software RUN mkdir -p /usr/share/man/man1 \