Browse Source

Fix bug/issue in SPA when building from build-container and it is not compatible in Linux with previous SPS content, so needs to run npm rebuild node-sass first

pull/82/head
Cesar De la Torre 8 years ago
parent
commit
e8c5eb1eb5
3 changed files with 9 additions and 52 deletions
  1. +7
    -0
      cli-linux/prepare-spa-app.sh
  2. +2
    -1
      docker-compose.ci.build.yml
  3. +0
    -51
      eShopOnContainers-ServicesAndWebApps.sln

+ 7
- 0
cli-linux/prepare-spa-app.sh View File

@ -0,0 +1,7 @@
# Build SPA app
pushd $(pwd)/src/Web/WebSPA
npm rebuild node-sass
#npm run build:prod

+ 2
- 1
docker-compose.ci.build.yml View File

@ -6,4 +6,5 @@ services:
volumes:
- .:/src
working_dir: /src
command: /bin/bash -c "dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && pushd ./../../.. && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"

+ 0
- 51
eShopOnContainers-ServicesAndWebApps.sln View File

@ -48,8 +48,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSPA", "src\Web\WebSPA\We
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "test\Services\IntegrationTests\IntegrationTests.csproj", "{5B810E3D-112E-4857-B197-F09D2FD41E27}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FunctionalTests", "test\Services\FunctionalTests\FunctionalTests.csproj", "{7DFE80A4-AC20-4E59-86CD-D37658F5506C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -496,54 +494,6 @@ Global
{5B810E3D-112E-4857-B197-F09D2FD41E27}.Release|x64.Build.0 = Release|Any CPU
{5B810E3D-112E-4857-B197-F09D2FD41E27}.Release|x86.ActiveCfg = Release|Any CPU
{5B810E3D-112E-4857-B197-F09D2FD41E27}.Release|x86.Build.0 = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|ARM.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|iPhone.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|x64.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|x64.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|x86.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.AppStore|x86.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|ARM.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|iPhone.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|x64.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|x64.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|x86.ActiveCfg = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Debug|x86.Build.0 = Debug|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|Any CPU.Build.0 = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|ARM.ActiveCfg = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|ARM.Build.0 = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|iPhone.ActiveCfg = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|iPhone.Build.0 = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|x64.ActiveCfg = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|x64.Build.0 = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|x86.ActiveCfg = Release|Any CPU
{7DFE80A4-AC20-4E59-86CD-D37658F5506C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -566,6 +516,5 @@ Global
{A579E108-5445-403D-A407-339AC4D1611B} = {24CD3B53-141E-4A07-9B0D-796641E1CF78}
{F16E3C6A-1C94-4EAB-BE91-099618060B68} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
{5B810E3D-112E-4857-B197-F09D2FD41E27} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
{7DFE80A4-AC20-4E59-86CD-D37658F5506C} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
EndGlobalSection
EndGlobal

Loading…
Cancel
Save