tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:Squidex/squidex 

# Conflicts:
#	Dockerfile
#	Dockerfile.build
pull/378/head
Sebastian Stehle 7 years ago
parent
36a4d2f1c0 ab1fb499fd
commit
92d6470744
4 changed files with 60 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      Dockerfile
  2. 15
      Dockerfile.build
  3. 38
      src/Squidex/package-lock.json
  4. 16
      src/Squidex/package.json

15
Dockerfile
View File

@ -5,11 +5,20 @@ FROM squidex/dotnet:2.2-sdk-chromium-phantomjs-node as builder
WORKDIR /src WORKDIR /src
# Copy Node project files.
COPY src/Squidex/package*.json /tmp/ COPY src/Squidex/package*.json /tmp/
# Install Node packages # Install Node packages
RUN cd /tmp && npm install --loglevel=error RUN cd /tmp && npm install --loglevel=error
# Copy nuget project files.
COPY /**/**/*.csproj /tmp/
# Copy nuget.config for package sources.
COPY NuGet.Config /tmp/
# Install nuget packages
RUN bash -c 'pushd /tmp; for p in *.csproj; do dotnet restore $p --verbosity quiet; true; done; popd'
COPY . . COPY . .
# Build Frontend # Build Frontend
@ -19,7 +28,11 @@ RUN cp -a /tmp/node_modules src/Squidex/ \
&& npm run build && npm run build
# Test Backend # Test Backend
RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies RUN dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj --filter Category!=Dependencies \
&& dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \
&& dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \
&& dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \
&& dotnet test tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj
# Publish # Publish
RUN dotnet publish src/Squidex/Squidex.csproj --output /out/alpine --configuration Release -r alpine.3.7-x64 RUN dotnet publish src/Squidex/Squidex.csproj --output /out/alpine --configuration Release -r alpine.3.7-x64

15
Dockerfile.build
View File

@ -2,11 +2,20 @@ FROM squidex/dotnet:2.2-sdk-chromium-phantomjs-node as builder
WORKDIR /src WORKDIR /src
# Copy Node project files.
COPY src/Squidex/package*.json /tmp/ COPY src/Squidex/package*.json /tmp/
# Install Node packages # Install Node packages
RUN cd /tmp && npm install --loglevel=error RUN cd /tmp && npm install --loglevel=error
# Copy Dotnet project files.
COPY /**/**/*.csproj /tmp/
# Copy nuget.config for package sources.
COPY NuGet.Config /tmp/
# Install Dotnet packages
RUN bash -c 'pushd /tmp; for p in *.csproj; do dotnet restore $p --verbosity quiet; true; done; popd'
COPY . . COPY . .
# Build Frontend # Build Frontend
@ -16,7 +25,11 @@ RUN cp -a /tmp/node_modules src/Squidex/ \
&& npm run build && npm run build
# Test Backend # Test Backend
RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies RUN dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj --filter Category!=Dependencies \
&& dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \
&& dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \
&& dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \
&& dotnet test tests/Squidex.Web.Tests/Squidex.Web.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

38
src/Squidex/package-lock.json
View File

@ -3196,14 +3196,22 @@
} }
}, },
"browserslist": { "browserslist": {
"version": "4.3.5", "version": "4.6.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.5.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.3.tgz",
"integrity": "sha512-z9ZhGc3d9e/sJ9dIx5NFXkKoaiQTnrvrMsN3R1fGb1tkWWNSz12UewJn9TNxGo1l7J23h0MRaPmk7jfeTZYs1w==", "integrity": "sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"caniuse-lite": "^1.0.30000912", "caniuse-lite": "^1.0.30000975",
"electron-to-chromium": "^1.3.86", "electron-to-chromium": "^1.3.164",
"node-releases": "^1.0.5" "node-releases": "^1.1.23"
},
"dependencies": {
"caniuse-lite": {
"version": "1.0.30000975",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000975.tgz",
"integrity": "sha512-ZsXA9YWQX6ATu5MNg+Vx/cMQ+hM6vBBSqDeJs8ruk9z0ky4yIHML15MoxcFt088ST2uyjgqyUGRJButkptWf0w==",
"dev": true
}
} }
}, },
"buffer": { "buffer": {
@ -3450,9 +3458,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30000918", "version": "1.0.30000975",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000918.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000975.tgz",
"integrity": "sha512-CAZ9QXGViBvhHnmIHhsTPSWFBujDaelKnUj7wwImbyQRxmXynYqKGi3UaZTSz9MoVh+1EVxOS/DFIkrJYgR3aw==", "integrity": "sha512-ZsXA9YWQX6ATu5MNg+Vx/cMQ+hM6vBBSqDeJs8ruk9z0ky4yIHML15MoxcFt088ST2uyjgqyUGRJButkptWf0w==",
"dev": true "dev": true
}, },
"canonical-path": { "canonical-path": {
@ -4950,9 +4958,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.90", "version": "1.3.164",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.90.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz",
"integrity": "sha512-IjJZKRhFbWSOX1w0sdIXgp4CMRguu6UYcTckyFF/Gjtemsu/25eZ+RXwFlV+UWcIueHyQA1UnRJxocTpH5NdGA==", "integrity": "sha512-VLlalqUeduN4+fayVtRZvGP2Hl1WrRxlwzh2XVVMJym3IFrQUS29BFQ1GP/BxOJXJI1OFCrJ5BnFEsAe8NHtOg==",
"dev": true "dev": true
}, },
"elliptic": { "elliptic": {
@ -10755,9 +10763,9 @@
} }
}, },
"node-releases": { "node-releases": {
"version": "1.1.1", "version": "1.1.23",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.1.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz",
"integrity": "sha512-2UXrBr6gvaebo5TNF84C66qyJJ6r0kxBObgZIDX3D3/mt1ADKiHux3NJPWisq0wxvJJdkjECH+9IIKYViKj71Q==", "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==",
"dev": true, "dev": true,
"requires": { "requires": {
"semver": "^5.3.0" "semver": "^5.3.0"

16
src/Squidex/package.json
View File

@ -47,21 +47,23 @@
"zone.js": "0.9.1" "zone.js": "0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@angular/compiler-cli": "7.2.14",
"@angular/compiler": "7.2.14", "@angular/compiler": "7.2.14",
"@angular/compiler-cli": "7.2.14",
"@ngtools/webpack": "7.3.8", "@ngtools/webpack": "7.3.8",
"@types/core-js": "2.5.0", "@types/core-js": "2.5.0",
"@types/jasmine": "3.3.12", "@types/jasmine": "3.3.12",
"@types/marked": "0.6.5", "@types/marked": "0.6.5",
"@types/mousetrap": "1.6", "@types/mousetrap": "1.6",
"@types/node": "12.0.0", "@types/node": "12.0.0",
"@types/react-dom": "16.8.4",
"@types/react": "16.8.16", "@types/react": "16.8.16",
"@types/react-dom": "16.8.4",
"@types/sortablejs": "1.7.2", "@types/sortablejs": "1.7.2",
"angular-router-loader": "0.8.5", "angular-router-loader": "0.8.5",
"angular2-template-loader": "0.6.2", "angular2-template-loader": "0.6.2",
"awesome-typescript-loader": "5.2.1", "awesome-typescript-loader": "5.2.1",
"babel-core": "6.26.3", "babel-core": "6.26.3",
"browserslist": "^4.6.3",
"caniuse-lite": "^1.0.30000975",
"circular-dependency-plugin": "5.0.2", "circular-dependency-plugin": "5.0.2",
"codelyzer": "5.0.1", "codelyzer": "5.0.1",
"cpx": "1.5.0", "cpx": "1.5.0",
@ -72,16 +74,16 @@
"ignore-loader": "0.1.2", "ignore-loader": "0.1.2",
"istanbul-instrumenter-loader": "3.0.1", "istanbul-instrumenter-loader": "3.0.1",
"jasmine-core": "3.4.0", "jasmine-core": "3.4.0",
"karma": "4.1.0",
"karma-chrome-launcher": "2.2.0", "karma-chrome-launcher": "2.2.0",
"karma-cli": "2.0.0", "karma-cli": "2.0.0",
"karma-coverage-istanbul-reporter": "2.0.5", "karma-coverage-istanbul-reporter": "2.0.5",
"karma-htmlfile-reporter": "0.3.8", "karma-htmlfile-reporter": "0.3.8",
"karma-jasmine-html-reporter": "1.4.2",
"karma-jasmine": "2.0.1", "karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.2",
"karma-mocha-reporter": "2.2.5", "karma-mocha-reporter": "2.2.5",
"karma-sourcemap-loader": "0.3.7", "karma-sourcemap-loader": "0.3.7",
"karma-webpack": "3.0.5", "karma-webpack": "3.0.5",
"karma": "4.1.0",
"mini-css-extract-plugin": "0.6.0", "mini-css-extract-plugin": "0.6.0",
"node-sass": "4.12.0", "node-sass": "4.12.0",
"optimize-css-assets-webpack-plugin": "5.0.1", "optimize-css-assets-webpack-plugin": "5.0.1",
@ -93,15 +95,15 @@
"style-loader": "0.23.1", "style-loader": "0.23.1",
"ts-loader": "5.4.5", "ts-loader": "5.4.5",
"tsconfig-paths-webpack-plugin": "3.2.0", "tsconfig-paths-webpack-plugin": "3.2.0",
"tslint-webpack-plugin": "2.0.4",
"tslint": "5.16.0", "tslint": "5.16.0",
"tslint-webpack-plugin": "2.0.4",
"typemoq": "2.1.0", "typemoq": "2.1.0",
"typescript": "3.2.4", "typescript": "3.2.4",
"uglifyjs-webpack-plugin": "2.1.2", "uglifyjs-webpack-plugin": "2.1.2",
"underscore": "1.9.1", "underscore": "1.9.1",
"webpack": "4.30.0",
"webpack-cli": "3.3.1", "webpack-cli": "3.3.1",
"webpack-dev-server": "3.3.1", "webpack-dev-server": "3.3.1",
"webpack-merge": "4.2.1", "webpack-merge": "4.2.1"
"webpack": "4.30.0"
} }
} }

Write Preview
Loading…
Cancel
Save