Skip to content

Commit d4c4619

Browse files
committed
Update Dockerfile and add prettier-plugin-sh
1 parent 907b67c commit d4c4619

8 files changed

Lines changed: 17 additions & 5 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
FROM mcr.microsoft.com/devcontainers/javascript-node:24-bookworm
22

33
RUN npm install --global pnpm@latest-10
4+
5+
RUN mkdir /usr/share/dotnet && chmod a+w /usr/share/dotnet

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"ghcr.io/devcontainer-config/features/user-init:2": {},
1111
"ghcr.io/devcontainer-config/features/dot-config:3": {},
1212
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
13-
"ghcr.io/devcontainers/features/dotnet:2": { "version": "8.0" }
13+
"ghcr.io/devcontainers/features/dotnet:2": { "version": "10.0" }
1414
},
1515
"customizations": {
1616
"vscode": {

scripts/buildx.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import path from "node:path";
22

33
import { $ } from "execa";
44

5-
import { projectRoot } from "@/scripts/project.js";
5+
import { projectRoot, workspaces } from "@/scripts/project.js";
66
import { $$ } from "@/scripts/shell.js";
77
import { getVersionTag } from "@/scripts/tasks/build.js";
88
import { deploy } from "@/scripts/tasks/deploy.js";
99

1010
const platforms: string[] = ["linux/amd64", "linux/arm64"];
1111

12-
const packagePath = path.resolve(projectRoot, ".local/docker");
12+
const packagePath = path.resolve(workspaces, "artifacts/package");
1313

1414
async function buildImage(registry: string, imageName: string, tags: string[], publish: boolean) {
1515
console.log("Building multi-arch Docker image...");

setup/configs/csharp/devcontainer.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { loadTemplates } from "../templates.js";
1414
export interface CSharpDevContainerConfigs {
1515
".devcontainer/.env": string;
1616
".devcontainer/devcontainer.json": string;
17+
".devcontainer/Dockerfile": string;
1718
".devcontainer/dot-config.json": string;
1819
}
1920

@@ -62,12 +63,19 @@ export const createCSharpDevContainerConfigs = async (
6263
].join("\n");
6364
})();
6465

66+
const dockerFilaPath = ".devcontainer/Dockerfile" satisfies keyof BaseConfigs;
67+
const dockerFileConfig = [
68+
baseConfig[dockerFilaPath],
69+
"RUN mkdir /usr/share/dotnet && chmod a+w /usr/share/dotnet",
70+
].join("\n");
71+
6572
return {
6673
".devcontainer/.env": propertiesComposer(
6774
baseConfig[".devcontainer/.env"],
6875
fillTemplate(templates[".devcontainer/.env"], { remoteUser }),
6976
),
7077
".devcontainer/devcontainer.json": devContainerConfig,
78+
".devcontainer/Dockerfile": dockerFileConfig,
7179
".devcontainer/dot-config.json": JSON.stringify(
7280
defaultComposer(
7381
jsonc.parse(baseConfig[".devcontainer/dot-config.json"]) as object,

setup/formatting.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export const prettierConfig: prettier.Config = {
88
import.meta.resolve("prettier-plugin-packagejson"),
99
import.meta.resolve("@prettier/plugin-xml"),
1010
import.meta.resolve("prettier-plugin-ini"),
11+
import.meta.resolve("prettier-plugin-sh"),
1112
],
1213
xmlWhitespaceSensitivity: "ignore",
1314
overrides: [

setup/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"prettier": "^3.6.2",
2828
"prettier-plugin-ini": "^1.3.0",
2929
"prettier-plugin-packagejson": "^2.5.19",
30+
"prettier-plugin-sh": "^0.18.0",
3031
"semver": "^7.7.3",
3132
"type-fest": "^5.2.0",
3233
"write-file-atomic": "^7.0.0"

setup/templates/csharp/.config/dotnet/Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Cake.Frosting" Version="4.0.0" />
6+
<PackageVersion Include="Cake.Frosting" Version="6.0.0" />
77
</ItemGroup>
88
</Project>

setup/templates/csharp/Automation/Automation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)