Convert to a proper distribution with Dockerfile

Author: blootsvoets

.dockerignore

@@ -0,0 +1,6 @@
+.git/
+build/
+src/test/
+out/
+.gradle/
+.idea/

Dockerfile

@@ -0,0 +1,45 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM openjdk:8-alpine AS builder
+
+RUN mkdir /code
+WORKDIR /code
+
+ENV GRADLE_OPTS -Dorg.gradle.daemon=false
+
+COPY ./gradle /code/gradle
+COPY ./gradlew /code/
+RUN ./gradlew --version
+
+COPY ./build.gradle ./gradle.properties ./settings.gradle /code/
+
+RUN ./gradlew downloadDependencies
+
+COPY ./src /code/src
+COPY LICENSE README.md /code/
+
+RUN ./gradlew distTar && \
+  tar xzf build/distributions/*.tar.gz && \
+  rm build/distributions/*.tar.gz
+
+FROM openjdk:8-jre-alpine
+
+MAINTAINER Joris Borgdorff <[email protected]>
+
+LABEL description="RADAR-base HDFS data restructuring"
+
+COPY --from=builder /code/radar-hdfs-restructure-*/bin /usr/bin
+COPY --from=builder /code/radar-hdfs-restructure-*/share /usr/share
+COPY --from=builder /code/radar-hdfs-restructure-*/lib /usr/lib
+
+ENTRYPOINT ["radar-hdfs-restructure"]

build.gradle

@@ -3,11 +3,7 @@ apply plugin: 'application'
 
 group 'org.radarcns.restructurehdfs'
 version '0.4.0-SNAPSHOT'
-mainClassName = 'org.radarcns.RestructureAvroRecords'
-
-run {
-    args = ['webhdfs://localhost:50070', '/topicAndroidNew/android_phone_sensor_acceleration', "${projectDir}/data"]
-}
+mainClassName = 'org.radarcns.hdfs.RestructureAvroRecords'
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
@@ -37,26 +33,32 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
-//create a single Jar with all dependencies
-task fatJar(type: Jar) {
+jar {
     manifest {
-        attributes 'Implementation-Title': 'radar-restructure-hdfs',
-                'Implementation-Version': version,
-                'Main-Class': mainClassName
+        attributes 'Implementation-Title': 'RADAR-base HDFS data restructuring',
+                'Implementation-Version': version
     }
-    classifier = 'all'
-    from {
-        configurations.runtimeClasspath.collect {
-            it.isDirectory() ? it : zipTree(it)
+}
+
+distributions {
+    main {
+        contents {
+            into ("share/${project.name}") {
+                from 'README.md', 'LICENSE'
+            }
         }
-    } {
-        exclude 'META-INF/*'
     }
-    with jar
 }
 
-artifacts {
-    archives fatJar
+tasks.withType(Tar){
+    compression = Compression.GZIP
+    extension = 'tar.gz'
+}
+
+task downloadDependencies {
+    description "Pre-downloads dependencies"
+    configurations.compileClasspath.files
+    configurations.runtimeClasspath.files
 }
 
 wrapper {

gradle.properties

@@ -1,2 +1 @@
-rootProject.name = 'restructurehdfs'
-
+rootProject.name = 'radar-hdfs-restructure'

settings.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.radarcns;
+package org.radarcns.hdfs;
 
 import org.apache.commons.collections.MapIterator;
 import org.apache.commons.collections.keyvalue.MultiKey;

src/main/java/org/radarcns/Frequency.java …in/java/org/radarcns/hdfs/Frequency.javasrc/main/java/org/radarcns/Frequency.java renamed to src/main/java/org/radarcns/hdfs/Frequency.java src/main/java/org/radarcns/Frequency.java renamed to src/main/java/org/radarcns/hdfs/Frequency.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.radarcns;
+package org.radarcns.hdfs;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

…/main/java/org/radarcns/OffsetRange.java …/java/org/radarcns/hdfs/OffsetRange.javasrc/main/java/org/radarcns/OffsetRange.java renamed to src/main/java/org/radarcns/hdfs/OffsetRange.java src/main/java/org/radarcns/OffsetRange.java renamed to src/main/java/org/radarcns/hdfs/OffsetRange.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.radarcns;
+package org.radarcns.hdfs;
 
 import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.databind.ObjectReader;

…n/java/org/radarcns/OffsetRangeFile.java …a/org/radarcns/hdfs/OffsetRangeFile.javasrc/main/java/org/radarcns/OffsetRangeFile.java renamed to src/main/java/org/radarcns/hdfs/OffsetRangeFile.java src/main/java/org/radarcns/OffsetRangeFile.java renamed to src/main/java/org/radarcns/hdfs/OffsetRangeFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.radarcns;
+package org.radarcns.hdfs;
 
 import javax.annotation.Nonnull;
 import java.util.Iterator;

…in/java/org/radarcns/OffsetRangeSet.java …va/org/radarcns/hdfs/OffsetRangeSet.javasrc/main/java/org/radarcns/OffsetRangeSet.java renamed to src/main/java/org/radarcns/hdfs/OffsetRangeSet.java src/main/java/org/radarcns/OffsetRangeSet.java renamed to src/main/java/org/radarcns/hdfs/OffsetRangeSet.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.radarcns;
+package org.radarcns.hdfs;
 
 import com.beust.jcommander.JCommander;
+import com.beust.jcommander.ParameterException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import org.apache.avro.Schema.Field;
 import org.apache.avro.file.DataFileReader;
@@ -28,12 +29,12 @@
 import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RemoteIterator;
-import org.radarcns.data.CsvAvroConverter;
-import org.radarcns.data.FileCacheStore;
-import org.radarcns.data.JsonAvroConverter;
-import org.radarcns.data.RecordConverterFactory;
-import org.radarcns.util.ProgressBar;
-import org.radarcns.util.commandline.CommandLineArgs;
+import org.radarcns.hdfs.data.CsvAvroConverter;
+import org.radarcns.hdfs.data.FileCacheStore;
+import org.radarcns.hdfs.data.JsonAvroConverter;
+import org.radarcns.hdfs.data.RecordConverterFactory;
+import org.radarcns.hdfs.util.ProgressBar;
+import org.radarcns.hdfs.util.commandline.CommandLineArgs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -83,10 +84,16 @@ public static void main(String [] args) {
         final CommandLineArgs commandLineArgs = new CommandLineArgs();
         final JCommander parser = JCommander.newBuilder().addObject(commandLineArgs).build();
 
-        parser.setProgramName("hadoop jar restructurehdfs-all-0.3.3.jar");
-        parser.parse(args);
+        parser.setProgramName("radar-hdfs-restructure");
+        try {
+            parser.parse(args);
+        } catch (ParameterException ex) {
+            logger.error(ex.getMessage());
+            parser.usage();
+            System.exit(1);
+        }
 
-        if(commandLineArgs.help) {
+        if (commandLineArgs.help) {
             parser.usage();
             System.exit(0);
         }