Commit f6f6adf2 authored by Liang Ding's avatar Liang Ding

Merge branch 'master' of https://github.com/b3log/solo

parents 32afed70 59eea47c
FROM maven:3.2-jdk-7-onbuild
FROM maven:3
MAINTAINER Liang Ding <dl88250@gmail.com>
ADD . /solo
......@@ -7,3 +7,5 @@ RUN mvn install
WORKDIR /solo/target/solo
EXPOSE 8080
CMD ["/bin/sh", "-c", "java -cp WEB-INF/lib/*:WEB-INF/classes org.b3log.solo.Starter"]
\ No newline at end of file
......@@ -282,8 +282,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment