Replace own IS_DOCKER by base image DOTNET_RUNNING_IN_CONTAINER (loic…

…-sharma#150)
chaghi · Dec 6, 2018 · ecf2c41 · ecf2c41
1 parent 29b93c6
commit ecf2c41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,6 @@ EXPOSE 80
 
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
-ENV IS_DOCKER true
 COPY /src .
 RUN dotnet restore BaGet
 RUN dotnet build BaGet -c Release -o /app

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -19,11 +19,11 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(IS_DOCKER) == ''">
+  <ItemGroup Condition="$(DOTNET_RUNNING_IN_CONTAINER) == ''">
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
   </ItemGroup>
 
-  <ItemGroup Condition="$(IsPackable) == 'true' AND $(IS_DOCKER) == ''">
+  <ItemGroup Condition="$(IsPackable) == 'true' AND $(DOTNET_RUNNING_IN_CONTAINER) == ''">
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
   </ItemGroup>