From efadd9a7267aab72305aefd0bc95b6fc8240cb75 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 4 Jul 2023 01:20:52 -0400 Subject: [PATCH] Fix Docker build - Change `.dockerignore` to use a blacklist for `/build` instead of whitelist. - Add missing `SrcCommon.props` to initial `COPY`s. --- .dockerignore | 18 ++++++------------ build/Dockerfile | 1 + 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.dockerignore b/.dockerignore index 0a5c0e76af..018b718239 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,18 +12,12 @@ appveyor.yml omnisharp.json README.md - -build/** -!build/analyzers.ruleset -!build/tgs.docker.sh -!build/tgs.ico -!build/tgs.png -!build/stylecop.json -!build/Version.props -!build/ControlPanelVersion.props -!build/Common.props -!build/NugetCommon.props -!build/uac_elevation_manifest.xml +build/package/** +build/coverlet.runsettings +build/Dockerfile +build/GenerateMigrations.sh +build/OpenApiValidationSettings.json +build/tgstation-server.service docs src/DMAPI src/Tgstation.Server.Host/ClientApp diff --git a/build/Dockerfile b/build/Dockerfile index 06b9ea71ae..39e392ca57 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -29,6 +29,7 @@ COPY build/Common.props Common.props COPY build/NugetCommon.props NugetCommon.props COPY build/Version.props Version.props COPY build/ControlPanelVersion.props ControlPanelVersion.props +COPY build/SrcCommon.props SrcCommon.props WORKDIR /repo/src/Tgstation.Server.Host