diff --git a/.gitattributes b/.gitattributes index cebe7cf04..82f474d77 100644 --- a/.gitattributes +++ b/.gitattributes @@ -62,4 +62,5 @@ #*.rtf diff=astextplain #*.RTF diff=astextplain -.sh text eol=lf \ No newline at end of file +.sh text eol=lf +.yml text eol=lf \ No newline at end of file diff --git a/build.docker-compose.yml b/build.docker-compose.yml index 2417f49e4..79c391d88 100644 --- a/build.docker-compose.yml +++ b/build.docker-compose.yml @@ -1,8 +1,10 @@ version: '2' services: - build: + squidex-build: +# Use custom aspnet images where phantomjs is installed image: sebastianstehle/aspnetcore-build:1.1.0-projectjson-phantomjs volumes: - .:/sln working_dir: /sln +# Run the build script on local folder entrypoint: ["sh", "./build.sh"] \ No newline at end of file diff --git a/build.sh b/build.sh index aedab8cb5..0ad9dd304 100644 --- a/build.sh +++ b/build.sh @@ -7,7 +7,7 @@ npm rebuild phantomjs-prebuilt npm run test:coverage npm run build:copy npm run build -cd ../.. +cd ./../.. dotnet restore dotnet test tests/Squidex.Core.Tests/project.json dotnet test tests/Squidex.Infrastructure.Tests/project.json