Merge pull request trinodb#20 from operator-framework/update_dockerfi…

…le_master Update Dockerfile build
chancez · Oct 22, 2019 · 0ee439f · 0ee439f
2 parents 2d18a1d + 9336fa2
commit 0ee439f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -73,10 +73,8 @@ COPY presto-password-authenticators /build/presto-password-authenticators
 COPY src /build/src
 COPY pom.xml /build/pom.xml
 
-# Install presto-server
-RUN cd /build/presto-server && mvn -B -e -T 1C -DskipTests -DfailIfNoTests=false -Dtest=false package
-# Install presto-cli
-RUN cd /build/presto-cli && mvn -B -e -T 1C -DskipTests -DfailIfNoTests=false -Dtest=false package
+# build presto
+RUN cd /build && mvn -B -e -DskipTests -DfailIfNoTests=false -Dtest=false clean package -pl '!presto-testing-docker'
 # Install prometheus-jmx agent
 RUN mvn -B dependency:get -Dartifact=io.prometheus.jmx:jmx_prometheus_javaagent:0.3.1:jar -Ddest=/build/jmx_prometheus_javaagent.jar
 

diff --git a/Dockerfile.okd b/Dockerfile.okd
@@ -73,10 +73,8 @@ COPY presto-password-authenticators /build/presto-password-authenticators
 COPY src /build/src
 COPY pom.xml /build/pom.xml
 
-# Install presto-server
-RUN cd /build/presto-server && mvn -B -e -T 1C -DskipTests -DfailIfNoTests=false -Dtest=false package
-# Install presto-cli
-RUN cd /build/presto-cli && mvn -B -e -T 1C -DskipTests -DfailIfNoTests=false -Dtest=false package
+# build presto
+RUN cd /build && mvn -B -e -DskipTests -DfailIfNoTests=false -Dtest=false clean package -pl '!presto-testing-docker'
 # Install prometheus-jmx agent
 RUN mvn -B dependency:get -Dartifact=io.prometheus.jmx:jmx_prometheus_javaagent:0.3.1:jar -Ddest=/build/jmx_prometheus_javaagent.jar