#814 First stable version
This commit is contained in:
parent
f2fc5b6b2b
commit
9cdfe0c5d9
18
Dockerfile
18
Dockerfile
|
|
@ -1,8 +1,16 @@
|
||||||
FROM node:8-slim
|
FROM vn-node
|
||||||
|
|
||||||
COPY . /salix
|
RUN mkdir /salix
|
||||||
COPY dist/webpack-assets.json /salix/client/
|
|
||||||
|
|
||||||
RUN npm -g install pm2
|
|
||||||
WORKDIR /salix
|
WORKDIR /salix
|
||||||
|
|
||||||
|
COPY dist .
|
||||||
|
COPY modules .
|
||||||
|
#COPY node_modules .
|
||||||
|
COPY loopback .
|
||||||
|
COPY dist/webpack-assets.json loopback/client
|
||||||
|
|
||||||
|
RUN rm /etc/nginx/sites-enabled/default
|
||||||
|
COPY services/nginx/temp/nginx.conf /etc/nginx/sites-available/salix
|
||||||
|
RUN ln -s /etc/nginx/sites-available/salix /etc/nginx/sites-enabled/salix
|
||||||
|
|
||||||
CMD ["pm2-docker", "./server/server.js"]
|
CMD ["pm2-docker", "./server/server.js"]
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ node {
|
||||||
|
|
||||||
}
|
}
|
||||||
stage ('Generating new dockers') {
|
stage ('Generating new dockers') {
|
||||||
sh "docker build -t vn-loopback:latest ./services/loopback/"
|
sh "docker build -t vn-loopback:latest ./loopback/"
|
||||||
sh "docker-compose up -d --build"
|
sh "docker-compose up -d --build"
|
||||||
sh "docker image prune -f"
|
sh "docker image prune -f"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>Salix</title>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
</head>
|
||||||
|
<body ng-app="vnAuth">
|
||||||
|
<vn-login></vn-login>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -1 +1,2 @@
|
||||||
export * from './src/auth';
|
import './module';
|
||||||
|
import './login/login';
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
|
|
@ -1,4 +1,4 @@
|
||||||
import {ng} from 'vendor';
|
import {ng} from 'core/vendor';
|
||||||
import 'core';
|
import 'core';
|
||||||
|
|
||||||
let ngModule = ng.module('vnAuth', ['vnCore']);
|
let ngModule = ng.module('vnAuth', ['vnCore']);
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
import './module';
|
|
||||||
import './login/login';
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import ngModule from '../../module';
|
import ngModule from '../../module';
|
||||||
import ModelProxy from '../model-proxy/model-proxy';
|
import ModelProxy from '../model-proxy/model-proxy';
|
||||||
import {mergeWhere, mergeFilters} from 'vn-loopback/common/filter.js';
|
import {mergeWhere, mergeFilters} from 'vn-loopback/util/filter';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Model that uses remote loopback model as datasource.
|
* Model that uses remote loopback model as datasource.
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import ngModule from '../../module';
|
import ngModule from '../../module';
|
||||||
import Component from '../../lib/component';
|
import Component from '../../lib/component';
|
||||||
import Flatpickr from 'vendor/src/flatpickr';
|
import {Flatpickr} from '../../vendor';
|
||||||
import './style.scss';
|
import './style.scss';
|
||||||
|
|
||||||
class DatePicker extends Component {
|
class DatePicker extends Component {
|
||||||
|
|
@ -3,7 +3,7 @@ import ngModule from '../../module';
|
||||||
import Component from '../../lib/component';
|
import Component from '../../lib/component';
|
||||||
import ArrayModel from '../array-model/array-model';
|
import ArrayModel from '../array-model/array-model';
|
||||||
import CrudModel from '../crud-model/crud-model';
|
import CrudModel from '../crud-model/crud-model';
|
||||||
import {mergeWhere} from 'vn-loopback/common/filter.js';
|
import {mergeWhere} from 'vn-loopback/util/filter';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @event select Thrown when model item is selected
|
* @event select Thrown when model item is selected
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue