Skip to content

Commit 9ef6791

Browse files
committed
update monkey-ws/Dockerfile so it includes monkey interpreter
1 parent 95434d7 commit 9ef6791

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

microservices/monkey-ws/Dockerfile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,29 @@ RUN set -x && \
1111
mv apache-maven-* maven && \
1212
ln -s /usr/share/maven/bin/mvn /bin/
1313

14+
WORKDIR /monkey
15+
# Add monkey interpreter so when monkey-ws is built it knows where to get it
16+
ADD pom.xml pom.xml
17+
ADD src src
18+
RUN mvn clean install package -Dmaven.test.skip
19+
1420
WORKDIR /helidon
1521

1622
# Create a first layer to cache the "Maven World" in the local repository.
1723
# Incremental docker builds will always resume after that, unless you update
1824
# the pom
19-
ADD pom.xml pom.xml
25+
ADD microservices/monkey-ws/pom.xml pom.xml
26+
# TODO: is this really needed? -Declipselink.weave.skip -Declipselink.weave.skip -DskipOpenApiGenerate
2027
RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip -Declipselink.weave.skip -DskipOpenApiGenerate
2128

2229
# Do the Maven build!
2330
# Incremental docker builds will resume here when you change sources
24-
ADD src src
31+
ADD microservices/monkey-ws/src src
2532
RUN mvn package -DskipTests
2633

34+
WORKDIR /helidon/target
35+
RUN ls -la
36+
2737
RUN echo "done!"
2838

2939
# 2nd stage, build the runtime image

microservices/monkey-ws/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<artifactId>monkey-ws</artifactId>
1414
<version>1.0-SNAPSHOT</version>
1515

16-
<properties>
17-
</properties>
18-
1916
<dependencies>
2017
<dependency>
2118
<groupId>io.helidon.microprofile.bundles</groupId>

microservices/playground-ws/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ADD microservices/playground-ws/src src
2222
# Incremental docker builds will always resume after that, unless you update
2323
# the pom
2424
ADD microservices/playground-ws/pom.xml .
25+
# TODO: is this really needed? -Declipselink.weave.skip -Declipselink.weave.skip -DskipOpenApiGenerate
2526
RUN mvn package -Prelease -Dmaven.test.skip -Declipselink.weave.skip -Declipselink.weave.skip -DskipOpenApiGenerate
2627

2728
# Do the Maven build!

src/test/java/org/interpreter/evaluator/EvaluatorTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
package org.interpreter.evaluator;
22

3-
import jdk.nashorn.internal.ir.annotations.Ignore;
43
import org.interpreter.ast.Identifier;
54
import org.interpreter.ast.Parser;
65
import org.interpreter.ast.Program;
76
import org.interpreter.evaluator.object.HashKey;
87
import org.interpreter.evaluator.object.HashPair;
98
import org.interpreter.evaluator.object.MHash;
109
import org.interpreter.lexer.Lexer;
11-
import org.junit.jupiter.api.Disabled;
1210
import org.junit.jupiter.api.Test;
1311

1412
import java.io.BufferedReader;
1513
import java.io.FileReader;
1614
import java.util.ArrayList;
17-
import java.util.Arrays;
1815
import java.util.HashMap;
1916
import java.util.Map;
2017

0 commit comments

Comments
 (0)