Skip to content

Commit d79f5a6

Browse files
author
Simon Stone
committed
[FAB-6415] Remove tests from Docker image build
The Docker image build currently builds a Gradle and Maven chaincode in order to check everything works correctly, and then removes it from the final image. Remove this, as this is what the tests are for! Signed-off-by: Simon Stone <[email protected]> Change-Id: I2899ac34e99546afba6bc5ca9c68a7701f2be520
1 parent 35d5884 commit d79f5a6

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

fabric-chaincode-docker/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,8 @@ RUN mvn -f pom-default.xml compile
4949
WORKDIR /root/chaincode-java/shim-src/fabric-chaincode-shim/build/publications/shimJar/
5050
RUN mvn -f pom-default.xml compile
5151

52-
# Sanity check and maven/gradle plugin installs - compiling sample chaincode - gradle and maven
53-
WORKDIR /root/chaincode-java/example-src/fabric-chaincode-example-gradle
54-
RUN gradle build shadowJar
55-
WORKDIR /root/chaincode-java/example-src/fabric-chaincode-example-maven
56-
RUN mvn compile package
57-
WORKDIR /root/chaincode-java
58-
5952
#Removing non-needed sources
6053
WORKDIR /root/chaincode-java
61-
RUN rm -rf example-src
6254
RUN rm -rf shim-src
6355

6456
# Creating final javaenv image which will include all required

fabric-chaincode-docker/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@ task copyAllDeps(type: Copy) {
6666
from project.getParent().file("settings.gradle")
6767
into('build/distributions/chaincode-java/shim-src/')
6868
}
69-
70-
copy {
71-
from project.getParent().file("fabric-chaincode-example-gradle")
72-
into('build/distributions/chaincode-java/example-src/fabric-chaincode-example-gradle')
73-
}
74-
75-
copy {
76-
from project.getParent().file("fabric-chaincode-example-maven")
77-
into('build/distributions/chaincode-java/example-src/fabric-chaincode-example-maven')
78-
}
7969
}
8070

8171
task buildImage(type: DockerBuildImage) {

0 commit comments

Comments
 (0)