Browse Source

Another attempt to fix build

pull/1/head
Sebastian 9 years ago
parent
commit
f50a4124f3
  1. 15
      .dockerignore
  2. 12
      .gitignore
  3. 17
      Dockerfile.build
  4. 8
      build.ps1

15
.dockerignore

@ -4,17 +4,20 @@
*.vs *.vs
*.log *.log
.vs
.git
# Build results # Build results
build **/build/
bin **/bin/
obj **/obj/
publish **/publish/
# Test Output # Test Output
_test-output **/_test-output/
# NodeJS # NodeJS
node_modules **/node_modules/
# Scripts (should be copied from node_modules on build) # Scripts (should be copied from node_modules on build)
**/wwwroot/scripts/**/*.* **/wwwroot/scripts/**/*.*

12
.gitignore

@ -5,16 +5,16 @@
*.log *.log
# Build results # Build results
build build/
bin bin/
obj obj/
publish publish/
# Test Output # Test Output
_test-output _test-output/
# NodeJS # NodeJS
node_modules node_modules/
# Scripts (should be copied from node_modules on build) # Scripts (should be copied from node_modules on build)
**/wwwroot/scripts/**/*.* **/wwwroot/scripts/**/*.*

17
Dockerfile.build

@ -34,19 +34,8 @@ COPY . .
WORKDIR / WORKDIR /
# Build Frontend
RUN cp -a /tmp/node_modules /src/Squidex/ \ RUN dotnet restore
&& cd /src/Squidex \
&& npm run build:copy \
&& npm run build \
&& npm run test:coverage
# Test Backend
RUN dotnet restore \
&& dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \
&& dotnet test tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj \
&& dotnet test tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj \
&& dotnet test tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj
# Publish # Publish
RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Release RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Release

8
build.ps1

@ -1,11 +1,11 @@
# Build the image # Build the image
docker build . -t build-image -f Dockerfile.build docker build . -t squidex-build-image -f Dockerfile.build
# Open the image # Open the image
docker create --name build-cont build-image docker create --name squidex-build-container squidex-build-image
# Copy the output to the host file system # Copy the output to the host file system
docker cp build-cont:/out ./publish docker cp squidex-build-container:/out ./publish
# Cleanup # Cleanup
docker rm build-cont docker rm squidex-build-container
Loading…
Cancel
Save