🎨 打包

Dockerfile

@@ -2,7 +2,7 @@ FROM maven:3-jdk-8-alpine as MVN_BUILD
 
 WORKDIR /opt/solo/
 ADD . /tmp
-RUN cd /tmp && mvn package -DskipTests -Pci -q && mkdir target/solo/ && unzip -q target/solo.jar -d target/solo/ && mv target/solo/* /opt/solo/ \
+RUN cd /tmp && mvn package -DskipTests -Pci -q && mv target/solo/* /opt/solo/ \
 && cp -f /tmp/src/main/resources/docker/* /opt/solo/
 
 FROM openjdk:8-alpine
@@ -15,4 +15,4 @@ RUN apk add --no-cache ca-certificates tzdata
 ENV TZ=Asia/Shanghai
 EXPOSE 8080
 
-ENTRYPOINT [ "java", "org.b3log.solo.Server" ]
+ENTRYPOINT [ "java", "-cp", "lib/*:.", "org.b3log.solo.Server" ]

pom.xml

@@ -316,18 +316,25 @@
             </plugin>
 
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
                         <manifest>
                             <mainClass>org.b3log.solo.Server</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
                         </manifest>
                     </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <finalName>solo</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/assembly/bin.xml</descriptor>
+                    </descriptors>
                 </configuration>
                 <executions>
                     <execution>

src/assembly/bin.xml

+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <unpack>true</unpack>
+            <includes>
+                <include>${artifact}</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <excludes>
+                <exclude>${artifact}</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file

src/main/java/org/b3log/solo/service/ImportService.java

@@ -21,6 +21,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
+import org.b3log.latke.Latkes;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
@@ -71,8 +72,8 @@ public class ImportService {
      */
     public void importMarkdowns() {
         new Thread(() -> {
-            final String markdownsPath = ImportService.class.getResource("/markdowns").getPath();
-            LOGGER.debug("Import directory [" + markdownsPath + "]");
+            final File markdownsPath = Latkes.getFile("/markdowns");
+            LOGGER.debug("Import directory [" + markdownsPath.getPath() + "]");
 
             final JSONObject admin = userQueryService.getAdmin();
             if (null == admin) { // Not init yet
@@ -83,7 +84,7 @@ public class ImportService {
 
             int succCnt = 0, failCnt = 0;
             final Set<String> failSet = new TreeSet<>();
-            final Collection<File> mds = FileUtils.listFiles(new File(markdownsPath), new String[]{"md"}, true);
+            final Collection<File> mds = FileUtils.listFiles(markdownsPath, new String[]{"md"}, true);
             if (null == mds || mds.isEmpty()) {
                 return;
             }

src/main/java/org/b3log/solo/util/Skins.java

@@ -195,7 +195,7 @@ public final class Skins {
             final URI uri = Skins.class.getResource("/skins").toURI();
             Path resourcePath;
             if (uri.getScheme().equals("jar")) {
-                FileSystem fileSystem = FileSystems.newFileSystem(uri, Collections.<String, Object>emptyMap());
+                final FileSystem fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
                 resourcePath = fileSystem.getPath("/skins");
             } else {
                 resourcePath = Paths.get(uri);