Merge pull request #141 from opendedup/dp3

Dp3

Author: opendedup

.gitignore

@@ -1,11 +1,14 @@
 /bin/
 install-packages/windows/SDFS-2.0.13-Setup.exe
 install-packages/windows/bin/jre/
+install-packages/windows/wix/
 install-packages/SDFS-3.0.1-Setup.exe
 windows-exe/*/x64
 windows-exe/*/Debug/
 windows-exe/*/Release/
 windows-exe/*/ipch/
+windows-exe/WindowsSetup/WindowsSetup/bin/
+windows-exe/WindowsSetup/WindowsSetup/obj/
 windows-exe/x64
 windows-exe/Debug/
 windows-exe/Release/

.settings/org.eclipse.jdt.apt.core.prefs

@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
-org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations
+org.eclipse.jdt.apt.aptEnabled=false
+org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations
+org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations

Dockerfile

@@ -8,23 +8,18 @@ COPY src /sdfs-build/src/
 COPY .git /sdfs-build/.git
 COPY install-packages /sdfs-build/install-packages/
 WORKDIR "/sdfs-build"
-RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
-    -y nsis
-RUN wget https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip && \
-    unzip EnVar_plugin.zip -d /usr/share/nsis/
-RUN wget https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip && \
-    unzip AccessControl.zip -d /usr/share/nsis/ && \
-    cp /usr/share/nsis/Plugins/i386-unicode/AccessControl.dll /usr/share/nsis/Plugins/x86-unicode/
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.48.21-ca-jre11.0.11-win_x64.zip && \
-    rm -rf install-packages/windows/bin/jre && \
-    unzip zulu11.48.21-ca-jre11.0.11-win_x64.zip -d /tmp/ && \
-    mv /tmp/zulu11.48.21-ca-jre11.0.11-win_x64  install-packages/windows/bin/jre
+RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" 
+
+#RUN wget https://cdn.azul.com/zulu/bin/zulu18.30.11-ca-jdk18.0.1-win_x64.zip && \
+#    rm -rf install-packages/windows/bin/jre && \
+#    unzip zulu18.30.11-ca-jdk18.0.1-win_x64.zip -d /tmp/ && \
+#    mv /tmp/zulu18.30.11-ca-jdk18.0.1-win_x64  install-packages/windows/bin/jre
 
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
+RUN wget https://cdn.azul.com/zulu/bin/zulu18.30.11-ca-jdk18.0.1-linux_x64.tar.gz && \
     rm -rf install-packages/deb/usr/share/sdfs/bin/jre && \
-    tar -xzvf zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
+    tar -xzvf zulu18.30.11-ca-jdk18.0.1-linux_x64.tar.gz && \
     mkdir -p install-packages/deb/usr/share/sdfs/bin/ && \
-    cp -rf zulu11.35.13-ca-jdk11.0.5-linux_x64 install-packages/deb/usr/share/sdfs/bin/jre
+    cp -rf zulu18.30.11-ca-jdk18.0.1-linux_x64 install-packages/deb/usr/share/sdfs/bin/jre
 RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
         git
 ENV VERSION=master
@@ -42,7 +37,6 @@ RUN cp target/lib/*.jar install-packages/deb/usr/share/sdfs/lib/ && \
     cp target/sdfs-${VERSION}.jar install-packages/deb/usr/share/sdfs/lib/sdfs.jar && \
     cp target/sdfs-${VERSION}.jar install-packages
 WORKDIR "/sdfs-build/install-packages/windows"
-RUN makensis -V4 -DVERSION=${PKG_VERSION} -DJARVERSION=${VERSION} sdfs_win.nsi 
 WORKDIR "/sdfs-build/install-packages/"
 RUN chmod 777 deb/sbin/sdfscli && \
     chmod 777 deb/usr/share/sdfs/sdfscli
@@ -52,9 +46,9 @@ RUN rm -rf *.deb *.rpm && \
     fpm -s dir -t deb -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -d libxml2-utils -m sam.silverberg@gmail.com --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" && \
     fpm -s dir -t rpm -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -m sam.silverberg@gmail.com --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" 
 WORKDIR "/sdfs-build/install-packages/"
-RUN echo "tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm SDFS-${PKG_VERSION}-Setup.exe" > export_data.sh && \
+RUN echo "tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm" > export_data.sh && \
     chmod 700 export_data.sh
-ENTRYPOINT tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm SDFS-${PKG_VERSION}-Setup.exe
+ENTRYPOINT tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm
 FROM ubuntu:20.04
 ENV VERSION=master
 ENV PKG_VERSION=0.0.1

Dockerfile.localbuild

@@ -39,23 +39,12 @@ COPY .git /sdfs-build/.git
 COPY install-packages /sdfs-build/install-packages/
 WORKDIR "/sdfs-build"
 RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
-    -y nsis
-RUN wget https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip && \
-    unzip EnVar_plugin.zip -d /usr/share/nsis/
-RUN wget https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip && \
-    unzip AccessControl.zip -d /usr/share/nsis/ && \
-    cp /usr/share/nsis/Plugins/i386-unicode/AccessControl.dll /usr/share/nsis/Plugins/x86-unicode/
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.48.21-ca-jre11.0.11-win_x64.zip && \
-    rm -rf install-packages/windows/bin/jre && \
-    unzip zulu11.48.21-ca-jre11.0.11-win_x64.zip -d /tmp/ && \
-    mv /tmp/zulu11.48.21-ca-jre11.0.11-win_x64  install-packages/windows/bin/jre
+        git
 RUN wget https://cdn.azul.com/zulu/bin/zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
     rm -rf install-packages/deb/usr/share/sdfs/bin/jre && \
     tar -xzvf zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
     mkdir -p install-packages/deb/usr/share/sdfs/bin/ && \
     cp -rf zulu11.35.13-ca-jdk11.0.5-linux_x64 install-packages/deb/usr/share/sdfs/bin/jre
-RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
-        git
 ENV VERSION=master
 ENV PKG_VERSION=0.0.1
 ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
@@ -69,19 +58,18 @@ RUN mvn package
 RUN cp target/lib/*.jar install-packages/deb/usr/share/sdfs/lib/ && \
     cp target/sdfs-${VERSION}.jar install-packages/deb/usr/share/sdfs/lib/sdfs.jar && \
     cp target/sdfs-${VERSION}.jar install-packages
-WORKDIR "/sdfs-build/install-packages/windows"
-RUN makensis -V4 -DVERSION=${PKG_VERSION} -DJARVERSION=${VERSION} sdfs_win.nsi
 WORKDIR "/sdfs-build/install-packages/"
 RUN rm -rf *.deb *.rpm && \
     cp ../src/readme.txt deb/usr/share/sdfs/ && \
     fpm -s dir -t deb -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -d libxml2-utils -m sam.silverberg@gmail.com --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" && \
     fpm -s dir -t rpm -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -m sam.silverberg@gmail.com --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" 
 WORKDIR "/sdfs-build/install-packages/"
-RUN echo "tar cvf - sdfs-${VERSION}-jar-with-dependencies.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm SDFS-${PKG_VERSION}-Setup.exe" > export_data.sh && \
+RUN echo "tar cvf - sdfs-${VERSION}-jar-with-dependencies.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm" > export_data.sh && \
     chmod 700 export_data.sh
 ENTRYPOINT tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm
 FROM ubuntu:20.04
 ENV VERSION=master
+ENV PKG_VERSION=0.0.1
 LABEL email=samsilverberg@google.com
 LABEL author="Sam Silverberg"
 RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
@@ -97,9 +85,9 @@ RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteracti
         libxml2-utils \
         fuse
 WORKDIR "/tmp"
-COPY --from=builder /sdfs-build/install-packages/sdfs_${VERSION}_amd64.deb .
-RUN dpkg -i sdfs_${VERSION}_amd64.deb && \
-    rm sdfs_${VERSION}_amd64.deb
+COPY --from=builder /sdfs-build/install-packages/sdfs_${PKG_VERSION}_amd64.deb .
+RUN dpkg -i sdfs_${PKG_VERSION}_amd64.deb && \
+    rm sdfs_${PKG_VERSION}_amd64.deb
 RUN echo "* hard nofile 65535" >> /etc/security/limits.conf
 RUN	echo "* soft nofile 65535" >> /etc/security/limits.conf
 COPY --from=builder /sdfs-build/install-packages/docker_run.sh /usr/share/sdfs/docker_run.sh

install-packages/deb/sbin/startsdfs

@@ -9,7 +9,7 @@ EXEC="/usr/share/sdfs/jsvc"
 BASEPATH="/usr/share/sdfs"
 PF="sdfs-ncfg.pid"
 OPTIND=1
-while getopts "v:z:f:p:e:anmzcdshcrl" opt; do
+while getopts "v:z:f:p:e:b:t:w:q:anmzcdshcrl" opt; do
   case $opt in
     v)
         CFG="/etc/sdfs/$OPTARG-volume-cfg.xml"
@@ -45,7 +45,7 @@ else
         MEMORY=$MEM
 fi
 
-LD_PRELOAD="${BASEPATH}/bin/libfuse.so.2" $EXEC -server -outfile '&1' -errfile '&2' -Djava.library.path=${BASEPATH}/bin/ -home ${BASEPATH}/bin/jre -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog -Xss2m \
+$EXEC -server -outfile '&1' -errfile '&2' -Djava.library.path=${BASEPATH}/bin/ -home ${BASEPATH}/bin/jre -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog -Xss2m \
  -wait 99999999999 -Dfuse.logging.level=INFO -Dfile.encoding=UTF-8 ${DOCKER_DETATCH} -Xmx$MEMORY$MU -Xms$MEMORY$MU \
--XX:+DisableExplicitGC -pidfile /var/run/$PF -XX:+UseG1GC -Djava.awt.headless=true \
+-XX:+DisableExplicitGC ${JAVA_EXT_CMD} -pidfile /var/run/$PF -XX:+UseG1GC -Djava.awt.headless=true \
  -cp ${BASEPATH}/lib/sdfs.jar:${BASEPATH}/lib/* fuse.SDFS.MountSDFS "$@"

install-packages/deb/usr/share/sdfs/startsdfs

@@ -1,6 +1,6 @@
 #!/bin/bash
 #modprobe fuse > /dev/null
-BASEMEMORY="10000"
+BASEMEMORY="15000"
 CACHEMEMORY=512
 MPTG=3
 LMPTG=2
@@ -9,7 +9,7 @@ EXEC="/usr/share/sdfs/jsvc"
 BASEPATH="/usr/share/sdfs"
 PF="sdfs-ncfg.pid"
 OPTIND=1
-while getopts "v:z:f:p:e:b:t:anmqzcdshcrlw" opt; do
+while getopts "v:z:f:p:e:b:t:w:q:anmzcdshcrl" opt; do
   case $opt in
     v)
         CFG="/etc/sdfs/$OPTARG-volume-cfg.xml"
@@ -53,6 +53,6 @@ else
 fi
 
 LD_PRELOAD="${BASEPATH}/bin/libfuse.so.2" $EXEC -server -outfile '&1' -errfile '&2' -Djava.library.path=${BASEPATH}/bin/ -home ${BASEPATH}/bin/jre -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog -Xss2m \
- -wait 99999999999 -Dfuse.logging.level=INFO -Dfile.encoding=UTF-8 ${DOCKER_DETATCH} -Xmx$MEMORY$MU -Xms$MEMORY$MU \
+${JAVA_EXT_CMD} -wait 99999999999 -Dfuse.logging.level=INFO -Dfile.encoding=UTF-8 ${DOCKER_DETATCH} -Xmx$MEMORY$MU -Xms$MEMORY$MU \
 -XX:+DisableExplicitGC -pidfile /var/run/$PF -XX:+UseG1GC ${TMPDIR} -Djava.awt.headless=true \
  -cp ${BASEPATH}/lib/sdfs.jar:${BASEPATH}/lib/* fuse.SDFS.MountSDFS "$@"