Fixed line endings in 2 files

Added copy of SA prefs if missing fixed dockerfile plugin configuration for deployment
DominiqueComte · Dec 7, 2017 · d22d158 · d22d158
1 parent ae482b0
commit d22d158
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/files/startup b/files/startup
@@ -11,6 +11,10 @@ if [ ! -f startup_done ]; then
   else
     rm spamassassin_user_prefs
   fi
+  if [ ! -f /root/.spamassassin/user_prefs ]; then
+    mkdir /root/.spamassassin
+    cp /var/spamassassin/user_prefs /root/.spamassassin/user_prefs
+  fi
   if [ ! -f .imapfilter/config.lua ]; then
     mv imapfilter_config.lua .imapfilter/config.lua
   else

diff --git a/pom.xml b/pom.xml
@@ -3,9 +3,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.morkitu.marmotte</groupId>
+  <groupId>domcomte</groupId>
   <artifactId>imapscan</artifactId>
-  <version>0.9</version>
+  <version>0.10</version>
 
   <description>Remote IMAP spam filtering.</description>
 
@@ -22,6 +22,26 @@
       </extension>
     </extensions>
     <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.7</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>com.spotify</groupId>
         <artifactId>dockerfile-maven-plugin</artifactId>
@@ -33,15 +53,29 @@
               <goal>build</goal>
             </goals>
           </execution>
+          <execution>
+            <id>default-push</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>push</goal>
+            </goals>
+          </execution>
         </executions>
         <configuration>
+          <repository>${project.groupId}/${project.artifactId}</repository>
+          <rm>true</rm>
+          <tag>${project.version}</tag>
+          <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
           <googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>
-          <dockerDirectory>${project.basedir}</dockerDirectory>
-          <imageName>${project.artifactId}</imageName>
-            <repository>domcomte/${project.artifactId}</repository>
-            <tag>${project.version}</tag>
         </configuration>
       </plugin>
     </plugins>
   </build>
+  <distributionManagement>
+    <repository>
+      <id>docker.io</id>
+      <name>Docker Hub</name>
+      <url>https://index.docker.io/v1/</url>
+    </repository>
+  </distributionManagement>
 </project>