Skip to content

Commit bce65f0

Browse files
committed
add Dockerfile with minimal build environment
1 parent 04eaf1f commit bce65f0

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
target

Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM java:7
2+
MAINTAINER https://github.com/docker-java/docker-java
3+
4+
ENV HOME /root
5+
ENV M2_HOME /opt/apache-maven-3.0.5
6+
7+
RUN wget http://www.eu.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz -O /tmp/apache-maven-3.0.5-bin.tar.gz \
8+
&& cd /tmp \
9+
&& tar xzf apache-maven-3.0.5-bin.tar.gz \
10+
&& mkdir -p /opt \
11+
&& mv apache-maven-3.0.5 /opt \
12+
&& rm apache-maven-3.0.5-bin.tar.gz
13+
14+
WORKDIR /project
15+
ADD . /project/
16+
17+
#ENTRYPOINT $M2_HOME/bin/mvn
18+
CMD $M2_HOME/bin/mvn verify

src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,15 @@ public void testEventStreamTimeBound() throws InterruptedException, IOException
6060
String endTime = getEpochTime();
6161

6262
CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
63-
EventCallback eventCallback = new EventCallbackTest(countDownLatch);
63+
EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
6464

6565
EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(startTime).withUntil(endTime);
6666
ExecutorService executorService = eventsCmd.exec();
6767

6868
boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
6969

7070
executorService.shutdown();
71+
eventCallback.close();
7172

7273
assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");
7374
}

0 commit comments

Comments
 (0)