svn commit: r1630250 - in /archiva/docker-file/trunk: Dockerfile README.md

[ol...@apache.org]

Author: olamy
Date: Wed Oct  8 23:10:18 2014
New Revision: 1630250

URL: http://svn.apache.org/r1630250
Log:
https://github.com/olamy/archiva-docker/pull/2


Modified:
    archiva/docker-file/trunk/Dockerfile
    archiva/docker-file/trunk/README.md

Modified: archiva/docker-file/trunk/Dockerfile
URL: http://svn.apache.org/viewvc/archiva/docker-file/trunk/Dockerfile?rev=1630250&r1=1630249&r2=1630250&view=diff
==============================================================================
--- archiva/docker-file/trunk/Dockerfile (original)
+++ archiva/docker-file/trunk/Dockerfile Wed Oct  8 23:10:18 2014
@@ -10,18 +10,27 @@ ENV VERSION 2.1.1
 
 RUN curl -sSLo /apache-archiva-$VERSION-bin.tar.gz http://archive.apache.org/dist/archiva/$VERSION/binaries/apache-archiva-$VERSION-bin.tar.gz \
   && tar --extract --ungzip --file apache-archiva-$VERSION-bin.tar.gz --directory / \
-  && rm /apache-archiva-$VERSION-bin.tar.gz
+  && rm /apache-archiva-$VERSION-bin.tar.gz && mv /apache-archiva-$VERSION /apache-archiva
+
+RUN useradd -d /apache-archiva/data -m archiva \
+  && rm /apache-archiva/conf/archiva.xml \
+  && ln -s /apache-archiva/data/archiva.xml /apache-archiva/conf/archiva.xml \
+  && mkdir /apache-archiva/repositories \
+  && chown archiva:archiva /apache-archiva/logs /apache-archiva/repositories /apache-archiva/temp
 
 #TODO fix sha1 md5 check
 #RUN echo "18b7124e6f0a2c8f7db8167c6946d762 apache-archiva-2.2.1-bin.tar.gz" | md5sum -c
 #RUN echo "5a7ddff9d85637cafa1e982a7b313a3ffe8190fa  apache-archiva-2.2.1-bin.tar.gz" | sha1sum -c
 
-ENV ARCHIVA_BASE /apache-archiva-$VERSION
-WORKDIR /apache-archiva-2.1.1
+ENV ARCHIVA_BASE /apache-archiva
+WORKDIR /apache-archiva
+
+USER archiva
 
-RUN mkdir /archiva-data
-RUN ln -s /archiva-data /apache-archiva-$VERSION/data
-VOLUME /archiva-data
+VOLUME /apache-archiva/data
+VOLUME /apache-archiva/logs
+VOLUME /apache-archiva/repositories
+VOLUME /apache-archiva/temp
 
 EXPOSE 8080
 CMD bin/archiva console

Modified: archiva/docker-file/trunk/README.md
URL: http://svn.apache.org/viewvc/archiva/docker-file/trunk/README.md?rev=1630250&r1=1630249&r2=1630250&view=diff
==============================================================================
--- archiva/docker-file/trunk/README.md (original)
+++ archiva/docker-file/trunk/README.md Wed Oct  8 23:10:18 2014
@@ -2,8 +2,10 @@
 
 # Usage
 
-```
-docker run -p 8080:8080 archiva
-```
+In order to get the logs with `docker logs` the `-t` option needs to be used.
 
+    docker run -t -p 8080:8080 archiva
 
+# Building
+
+    docker build -t olamy/archiva .