Skip to content

Commit e11bbc2

Browse files
author
Carlos Cañizares Estévez
committed
docker file
1 parent 0521e1b commit e11bbc2

3 files changed

Lines changed: 22 additions & 8 deletions

File tree

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1919
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
20-
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
2121
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
2222
<AndroidStoreUncompressedFileExtensions />
2323
<MandroidI18n />

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,27 @@
307307
<ItemGroup>
308308
<AndroidResource Include="Resources\drawable-xxxhdpi\menu_cart.png" />
309309
</ItemGroup>
310+
<ItemGroup>
311+
<AndroidResource Include="Resources\drawable-xxxhdpi\icon.png" />
312+
</ItemGroup>
313+
<ItemGroup>
314+
<AndroidResource Include="Resources\drawable-hdpi\background.png" />
315+
</ItemGroup>
316+
<ItemGroup>
317+
<AndroidResource Include="Resources\drawable-xhdpi\background.png" />
318+
</ItemGroup>
319+
<ItemGroup>
320+
<AndroidResource Include="Resources\drawable-xxhdpi\background.png" />
321+
</ItemGroup>
322+
<ItemGroup>
323+
<AndroidResource Include="Resources\drawable-xxxhdpi\background.png" />
324+
</ItemGroup>
325+
<ItemGroup>
326+
<AndroidResource Include="Resources\drawable\fake_product_04.png" />
327+
</ItemGroup>
328+
<ItemGroup>
329+
<AndroidResource Include="Resources\drawable\fake_product_05.png" />
330+
</ItemGroup>
310331
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
311332
<Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
312333
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
# FROM microsoft/aspnet:1.0.0-rc1-update1
2-
# COPY . /app
3-
# WORKDIR /app
4-
# RUN ["dnu", "restore"]
5-
# EXPOSE 5104/tcp
6-
# ENTRYPOINT ["dnx", "-p", "project.json", "web"]
7-
81
FROM microsoft/aspnetcore:1.0.1
92
ENTRYPOINT ["dotnet", "eShopOnContainers.WebSPA.dll"]
103
ARG source=.

0 commit comments

Comments
 (0)