diff --git a/.dockerignore b/.dockerignore index 01af429f..704624fa 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,8 @@ **/bin/ **/obj/ **/out/ +.artifacts/ +**/.artifacts/ # Visual Studio / VS Code .vs/ diff --git a/.github/workflows/build-docker-task.yml b/.github/workflows/build-docker-task.yml index 6e2284cc..f43a9022 100644 --- a/.github/workflows/build-docker-task.yml +++ b/.github/workflows/build-docker-task.yml @@ -36,6 +36,8 @@ jobs: with: platforms: linux/amd64,linux/arm64 + # Always login to Docker Hub, not just on push, to benefit from + # higher rate limits with a Docker subscription for pulls and cache - name: Login to Docker Hub step uses: docker/login-action@v3 with: @@ -59,7 +61,7 @@ jobs: BUILD_CONFIGURATION=${{ github.ref_name == 'main' && 'Release' || 'Debug' }} BUILD_VERSION=${{ needs.get-version.outputs.AssemblyVersion }} BUILD_FILE_VERSION=${{ needs.get-version.outputs.AssemblyFileVersion }} - BUILD_ASSEMBLY_VERSION=${{ needs.get-version.outputs.AssemblyFileVersion }} + BUILD_ASSEMBLY_VERSION=${{ needs.get-version.outputs.AssemblyVersion }} BUILD_INFORMATION_VERSION=${{ needs.get-version.outputs.AssemblyInformationalVersion }} BUILD_PACKAGE_VERSION=${{ needs.get-version.outputs.SemVer2 }} diff --git a/Docker/Dockerfile b/Docker/Dockerfile index cc72163b..3709c11e 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -15,10 +15,13 @@ # Build Dockerfile # docker buildx create --name "projecttemplate" --use -# docker buildx build --platform linux/amd64,linux/arm64 --file ./Docker/Ubuntu.Rolling.Dockerfile . +# docker buildx build --platform linux/amd64,linux/arm64 --file ./Docker/Dockerfile . + +# Build and log output +# docker buildx build --no-cache --progress=plain --platform linux/amd64 --file ./Docker/Dockerfile . 2>&1 | tee build.log # Test linux/amd64 target -# docker buildx build --load --platform linux/amd64 --tag projecttemplate:latest --file ./Docker/Ubuntu.Rolling.Dockerfile . +# docker buildx build --load --platform linux/amd64 --tag projecttemplate:latest --file ./Docker/Dockerfile . # docker run -it --rm --name ProjectTemplate-Test projecttemplate:latest /bin/bash diff --git a/ProjectTemplate.code-workspace b/ProjectTemplate.code-workspace index b480db84..0ad06819 100644 --- a/ProjectTemplate.code-workspace +++ b/ProjectTemplate.code-workspace @@ -73,8 +73,6 @@ "editor.formatOnSave": true, "editor.defaultFormatter": "csharpier.csharpier-vscode" }, - "chat.agent.maxRequests": 100, - "githubLocalActions.actCommand": "act --artifact-server-path ./.artifacts", "git.alwaysSignOff": true, "markdown.extension.toc.levels": "2..3" },