Skip to content

Commit

Permalink
Conflicts are merged; more changes in init templates
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Sutormin committed Feb 23, 2017
2 parents af0af28 + 2d738f8 commit 3fe3e88
Show file tree
Hide file tree
Showing 6 changed files with 747 additions and 13 deletions.
2 changes: 1 addition & 1 deletion sdkbase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ONBUILD RUN \
rm -rf jars && \
git clone https://github.com/kbase/jars && \
rm -rf kb_sdk && \
git clone https://github.com/kbase/kb_sdk -b develop && \
git clone https://github.com/kbase/kb_sdk -b auth2 && \
cd /kb/dev_container/modules/jars && \
make && make deploy && \
cd /kb/dev_container/modules/kb_sdk && \
Expand Down
Loading

0 comments on commit 3fe3e88

Please sign in to comment.