1+ /*
2+ Copyright DTCC 2016 All Rights Reserved.
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+ */
16+
117package java
218
319import (
420 "archive/tar"
521 "fmt"
22+ "io/ioutil"
623 "strings"
724 "time"
825
@@ -13,6 +30,31 @@ import (
1330 "github.com/spf13/viper"
1431)
1532
33+ var buildCmd = map [string ]string {
34+ "build.gradle" : "gradle -b build.gradle clean && gradle -b build.gradle build" ,
35+ "pom.xml" : "mvn -f pom.xml clean && mvn -f pom.xml package" ,
36+ }
37+
38+ //return the type of build gradle/maven based on the file
39+ //found in java chaincode project root
40+ //build.gradle - gradle - returns the first found build type
41+ //pom.xml - maven
42+ func getBuildCmd (packagePath string ) (string , error ) {
43+ files , err := ioutil .ReadDir (packagePath )
44+ if err != nil {
45+ return "" , err
46+ } else {
47+ for _ , f := range files {
48+ if ! f .IsDir () {
49+ if buildCmd , ok := buildCmd [f .Name ()]; ok == true {
50+ return buildCmd , nil
51+ }
52+ }
53+ }
54+ return "" , fmt .Errorf ("Build file not found" )
55+ }
56+ }
57+
1658//tw is expected to have the chaincode in it from GenerateHashcode.
1759//This method will just package the dockerfile
1860func writeChaincodePackage (spec * pb.ChaincodeSpec , tw * tar.Writer ) error {
@@ -42,22 +84,25 @@ func writeChaincodePackage(spec *pb.ChaincodeSpec, tw *tar.Writer) error {
4284 urlLocation = urlLocation [:len (urlLocation )- 1 ]
4385 }
4486
87+ buildCmd , err := getBuildCmd (urlLocation )
88+ if err != nil {
89+ return err
90+ }
4591 var dockerFileContents string
4692 var buf []string
4793
4894 if viper .GetBool ("security.enabled" ) {
4995 //todo
5096 } else {
5197 buf = append (buf , cutil .GetDockerfileFromConfig ("chaincode.java.Dockerfile" ))
52- buf = append (buf , "COPY src /root" )
53- buf = append (buf , "RUN gradle -b build.gradle build" )
54- buf = append (buf , "RUN unzip -od /root build/distributions/Chaincode.zip " )
55-
98+ buf = append (buf , "COPY src /root/chaincode " )
99+ buf = append (buf , "RUN cd /root/chaincode && " + buildCmd )
100+ buf = append (buf , "RUN cp /root/chaincode/build/chaincode.jar /root " )
101+ buf = append ( buf , "RUN cp /root/chaincode/build/libs/* /root/libs" )
56102 }
57- dockerFileContents = strings .Join (buf , "\n " )
58103
104+ dockerFileContents = strings .Join (buf , "\n " )
59105 dockerFileSize := int64 (len ([]byte (dockerFileContents )))
60-
61106 //Make headers identical by using zero time
62107 var zeroTime time.Time
63108 tw .WriteHeader (& tar.Header {Name : "Dockerfile" , Size : dockerFileSize , ModTime : zeroTime , AccessTime : zeroTime , ChangeTime : zeroTime })
0 commit comments