Review ideas

Signed-off-by: Matthew B White <[email protected]>
fraVlaca · May 20, 2021 · e096d4f · e096d4f
1 parent 7645bb9
commit e096d4f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/fabric-chaincode-docker/Dockerfile b/fabric-chaincode-docker/Dockerfile
@@ -34,9 +34,7 @@ RUN gradle \
     clean \
     fabric-chaincode-protos:build \
     fabric-chaincode-protos:publishToMavenLocal \
-    #Wfabric-chaincode-protos:publishProtosJarPublicationToMavenLocal \
     fabric-chaincode-shim:build \
-    #fabric-chaincode-shim:publishShimJarPublicationToMavenLocal \
     fabric-chaincode-shim:publishToMavenLocal \
     -x javadoc \
     -x test \
@@ -52,10 +50,8 @@ RUN mvn -f pom-default.xml compile
 WORKDIR /root/chaincode-java/shim-src/fabric-chaincode-shim/build/publications/shimJar/
 RUN mvn -f pom-default.xml compile
 
-#Removing non-needed sources
-WORKDIR /root/chaincode-java
-RUN rm -rf shim-src
-
+# Run the Gradle and Maven commands to generate the wrapper variants
+# of each tool
 #Gradle doesn't run without settings.gradle file, so create one
 RUN touch settings.gradle
 RUN gradle wrapper
@@ -67,8 +63,8 @@ FROM adoptopenjdk/openjdk11:jdk-11.0.4_11-alpine
 RUN apk add --no-cache bash
 
 SHELL ["/bin/bash", "-c"]
-ENV PATH="/usr/bin/maven/bin:/usr/bin/maven/:/usr/bin/gradle:/usr/bin/gradle/bin:${PATH}"
 
+# Copy setup scripts, and the cached dependeices
 COPY --from=dependencies /root/chaincode-java /root/chaincode-java
 COPY --from=dependencies /root/.m2 /root/.m2