[roller] branch master updated: War file location fix

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/master by this push:
     new 7e18e38  War file location fix
     new 8f2aef8  Merge pull request #33 from fileme/patch-1
7e18e38 is described below

commit 7e18e380f038ce51dff1d57e96328ff64d8be1cc
Author: fileme <fi...@gmail.com>
AuthorDate: Tue Jul 16 08:52:07 2019 -0500

    War file location fix
    
    Fix for getting the war file from the right location.
    Steps for validation:
    
    git clone https://github.com/apache/roller.git
    cd roller
    docker build -t rollerdocker .
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 53affc4..2dcbcd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,7 +62,7 @@ ENV DATABASE_HOST ${DATABASE_HOST}
 # install Roller WAR as ROOT.war, create data dirs
 
 WORKDIR /usr/local/roller
-COPY --from=builder /project/app/target/roller.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=builder /tmp/roller/app/target/roller.war /usr/local/tomcat/webapps/ROOT.war
 RUN mkdir -p data/mediafiles data/searchindex
 
 # download PostgreSQL and MySQL drivers plus Mail and Activation JARs
@@ -81,4 +81,4 @@ RUN chgrp -R 0 /usr/local/tomcat
 RUN chmod -R g+rw /usr/local/tomcat
 
 WORKDIR /usr/local/tomcat
-ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh
\ No newline at end of file
+ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh