wy65701436
|
9441b2711f
|
make support clarity
|
2017-03-07 23:43:07 -08:00 |
|
Wenkai Yin
|
414e8a8bcf
|
Merge remote-tracking branch 'upstream/dev' into 170224_merge_config
Conflicts:
make/docker-compose.tpl
src/ui/service/token/authutils.go
|
2017-02-24 13:52:19 +08:00 |
|
Tan Jiang
|
c3c1b84ed1
|
preparae --conf instead of -conf
|
2017-02-20 13:21:29 +08:00 |
|
Wenkai Yin
|
6dc6b4fa79
|
update Makefile
|
2017-02-10 17:03:21 +08:00 |
|
yhua
|
4c213a8717
|
remove openldap lib from Dockerfile and support build with offcial golang image(1.7.3)
|
2017-01-04 17:48:20 +08:00 |
|
yhua
|
0249f2181a
|
update registry from 2.5.0 to 2.5.1
|
2016-12-15 16:50:50 +08:00 |
|
yhua
|
73200193d1
|
package the photon 1.0 image in offline.tgz
|
2016-11-29 12:44:54 +08:00 |
|
yhua
|
09b62157cf
|
modify prepare for genrate all common/config files from template
|
2016-11-08 17:40:19 +08:00 |
|
yhua
|
9c91fdc18e
|
update Makefile for local create compile_ golangimage and fix some issue
|
2016-11-08 14:23:41 +08:00 |
|
yhua
|
fa9df7c75f
|
resolve conflict(2)
|
2016-11-04 18:32:33 +08:00 |
|
yhua
|
84f4a69f26
|
reslove confilc(1)
|
2016-11-04 18:17:33 +08:00 |
|
yhua
|
bb8e8eb148
|
reslove confilc
|
2016-11-04 18:13:03 +08:00 |
|
yhua
|
158550a02a
|
change some describe in docs/compile_guide.md and fix one makefile issue
|
2016-11-04 15:25:06 +08:00 |
|
yhua
|
88b122a777
|
add document for make process and build local golang image into Makefile
|
2016-11-02 17:29:12 +08:00 |
|
yhua
|
8c42d0a75d
|
fix some typo
|
2016-10-31 10:20:06 +08:00 |
|
yhua123
|
3eaee03906
|
Update Makefile
fix #975 and #979
|
2016-10-29 22:26:21 +08:00 |
|
yhua
|
ba5994bf01
|
change prepare from build to install
|
2016-10-27 15:09:45 +08:00 |
|
yhua
|
03e2a3ee56
|
remove tag in docker-compose.yml
|
2016-10-26 13:09:12 +08:00 |
|
yhua
|
f01c0fd870
|
fix nginx:1.9.0 remove 0
|
2016-10-25 16:10:56 +08:00 |
|
yhua
|
2548bb06a0
|
improve make clean user interactions and fix one dir issue for golang image build
|
2016-10-25 15:45:55 +08:00 |
|
yhua
|
2cd11fb6b9
|
fix golang image compile issue(1)
|
2016-10-25 12:05:16 +08:00 |
|
yhua
|
0bd8627855
|
fix golang image compile issue
|
2016-10-25 11:48:10 +08:00 |
|
yhua
|
ebc852b7cc
|
fix #924 #925
|
2016-10-24 16:48:48 +08:00 |
|
yhua
|
69797c30f2
|
fix pushimage, update .gitignore, add DEVFLAG
|
2016-10-24 14:06:23 +08:00 |
|
yhua
|
311cf8da07
|
change code 20161019
|
2016-10-21 18:39:10 +08:00 |
|