AppImage Builder Docker container

Author: ddmitov

CREDITS.md

@@ -258,6 +258,13 @@ https://specifications.freedesktop.org/desktop-entry-spec/1.1/apa.html
 https://github.com/probonopd/linuxdeployqt  
 http://output.jsbin.com/qoqukof  
 
+## Docker Containers
+
+https://perlmaven.com/dancer-in-docker  
+https://github.com/AppImage/AppImageKit/wiki/FUSE  
+https://medium.com/redbubble/running-a-docker-container-as-a-non-root-user-7d2e00f8ee15  
+https://docs.docker.com/engine/reference/builder/  
+
 ## Mac
 
 http://leonid.shevtsov.me/en/how-to-create-icns-icons-for-os-x  
@@ -266,9 +273,10 @@ http://leonid.shevtsov.me/en/how-to-create-icns-icons-for-os-x
 
 https://superuser.com/questions/188058/which-ports-are-considered-unsafe-on-chrome  
 
-## GitHub
+## Git and GitHub
 
 https://github.com/github/linguist#overrides  
+https://stackoverflow.com/questions/927358/how-do-i-undo-the-most-recent-commits-in-git  
 
 ## Travis CI
 

doc/PACKAGING.md

@@ -30,4 +30,35 @@ PEB or any PEB-based application can be easily packed as a 64-bit single-file Li
 
 In both modes of operation, the [AppImage Maker](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/appimage-maker.sh) uses the [linuxdeployqt](https://github.com/probonopd/linuxdeployqt/releases/) tool to detect all Qt dependencies of PEB and build the final image.  
 
-[AppImage Maker](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/appimage-maker.sh) script must be started from the ``{PEB_executable_directory}/sdk`` directory.
+[AppImage Maker](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/appimage-maker.sh) script must be started from the ``{PEB_executable_directory}/sdk`` directory.  
+
+An easy building environment for PEB AppImage executables is the provided [AppImage Builder Docker container](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/Dockerfile).  
+To build it type the following command from the ``{PEB_executable_directory}/sdk`` directory:  
+
+```bash
+sudo docker build -t appimage-builder .
+```
+
+To start the AppImage Builder container type the following command from the ``{PEB_executable_directory}/sdk`` directory:  
+
+```bash
+sudo docker container run --rm -it -v $(pwd)/..:/opt --user $(id -u):$(id -g) appimage-builder
+```
+
+When [AppImage Builder Docker container](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/Dockerfile) is running, type:
+
+```bash
+cd /opt/sdk
+```
+
+To start the [AppImage Maker](https://github.com/ddmitov/perl-executing-browser/blob/master/sdk/appimage-maker.sh), type either:
+
+```bash
+appimage-maker.sh --no-resources
+```
+
+or
+
+```bash
+appimage-maker.sh --include-resources
+```

sdk/Dockerfile

@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y wget && \
+    apt-get install -y build-essential && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository --yes ppa:ubuntu-sdk-team/ppa && \
+    apt update -qq && \
+    apt-get install -y qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev && \
+    apt-get install -y qt5-default qttools5-dev-tools && \
+    echo "DONE"

sdk/appimage-maker.sh

@@ -25,10 +25,10 @@ for i in "$@"
 done
 
 if [ $mode == "none" ]; then
-  printf "\\nappimage-maker --include-resources\\n"
-  printf "\\nto pack a PEB-based application or\\n"
-  printf "\\nappimage-maker --no-resources\\n"
-  printf "\\nto pack only a PEB executable\\n"
+  printf "appimage-maker --include-resources\\n"
+  printf " to pack a PEB-based application or\\n"
+  printf "appimage-maker --no-resources\\n"
+  printf " to pack only a PEB executable\\n"
   exit 1
 fi
 
@@ -59,9 +59,11 @@ if [ $mode == "no-resources" ]; then
   mkdir -p "$(pwd)/peb.app/usr/share/metainfo"
   cp "$(pwd)/sdk/appimage/peb.appdata.xml" "$(pwd)/peb.app/usr/share/metainfo/peb.appdata.xml"
 
-  "$(pwd)/$linuxdeployqt" "$(pwd)/peb.app/peb" -qmake='qmake -qt=qt5' -no-translations -appimage
+  "$(pwd)/$linuxdeployqt" "--appimage-extract"
+  "$(pwd)/squashfs-root/AppRun" "$(pwd)/peb.app/peb" -qmake='qmake -qt=qt5' -no-translations -appimage
 
   rm -rf "$(pwd)/peb.app"
+  rm -rf "$(pwd)/squashfs-root"
 fi
 
 if [ $mode == "include-resources" ]; then
@@ -71,37 +73,39 @@ if [ $mode == "include-resources" ]; then
     exit 1
   fi
 
-  package_name="$(basename "$package_desktop_file" .desktop)"
+  appimage_name="$(basename "$package_desktop_file" .desktop)"
 
-  rm -rf "$(pwd)/$package_name.app"
-  mkdir "$(pwd)/$package_name.app"
+  rm -rf "$(pwd)/$appimage_name.app"
+  mkdir "$(pwd)/$appimage_name.app"
 
-  cp -f "$(pwd)/peb" "$(pwd)/$package_name.app/$package_name"
-  cp -f "$package_desktop_file" "$(pwd)/$package_name.app/$package_name.desktop"
-  cp -r "$(pwd)/resources" "$(pwd)/$package_name.app/resources"
+  cp -f "$(pwd)/peb" "$(pwd)/$appimage_name.app/$appimage_name"
+  cp -f "$package_desktop_file" "$(pwd)/$appimage_name.app/$appimage_name.desktop"
+  cp -r "$(pwd)/resources" "$(pwd)/$appimage_name.app/resources"
 
   if [ -e "$(pwd)/resources/app.png" ]; then
-    cp -f "$(pwd)/resources/app.png" "$(pwd)/$package_name.app/app.png"
+    cp -f "$(pwd)/resources/app.png" "$(pwd)/$appimage_name.app/app.png"
   fi
 
-  if [ -e "$(pwd)/resources/appimage/$package_name.appdata.xml" ]; then
-    mkdir -p "$(pwd)/$package_name.app/usr/share/metainfo"
-    cp -f "$(pwd)/resources/appimage/$package_name.appdata.xml" "$(pwd)/$package_name.app/usr/share/metainfo/$package_name.appdata.xml"
+  if [ -e "$(pwd)/resources/appimage/$appimage_name.appdata.xml" ]; then
+    mkdir -p "$(pwd)/$appimage_name.app/usr/share/metainfo"
+    cp -f "$(pwd)/resources/appimage/$appimage_name.appdata.xml" "$(pwd)/$appimage_name.app/usr/share/metainfo/$appimage_name.appdata.xml"
   fi
 
-  rm -rf "$(pwd)/$package_name.app/resources/appimage"
+  rm -rf "$(pwd)/$appimage_name.app/resources/appimage"
 
   relocatable_perl="$(pwd)/resources/app/perl/bin/perl"
   compactor_script="$(pwd)/sdk/compactor.pl"
 
   if [ -e "$relocatable_perl" ]; then
     printf "\\nGoing to compact the relocatable Perl for this copy of Perl Executing Browser.\\n"
-    "$relocatable_perl" "$compactor_script" "--AppImage"
+    "$relocatable_perl" "$compactor_script" "--appimage=$appimage_name"
   else
     printf "\\nRelocatable Perl is not found for this copy of Perl Executing Browser.\\n"
   fi
 
-  "$(pwd)/$linuxdeployqt" "$(pwd)/$package_name.app/$package_name" -qmake='qmake -qt=qt5' -no-translations -appimage
+  "$(pwd)/$linuxdeployqt" "--appimage-extract"
+  "$(pwd)/squashfs-root/AppRun" "$(pwd)/$appimage_name.app/$appimage_name" -qmake='qmake -qt=qt5' -no-translations -appimage
 
-  rm -rf "$(pwd)/$package_name.app"
+  rm -rf "$(pwd)/squashfs-root"
+  rm -rf "$(pwd)/$appimage_name.app"
 fi

sdk/compactor.pl

@@ -10,6 +10,7 @@
 use File::Spec;
 use File::Spec::Functions qw(catdir);
 use FindBin qw($Bin);
+use Getopt::Long qw(GetOptions);
 use lib catdir($Bin, "lib");
 
 # Non-core CPAN modules:
@@ -18,7 +19,13 @@
 use File::Copy::Recursive qw(fcopy);
 use Module::ScanDeps;
 
-print "\nPerl Distribution Compactor for Perl Executing Browser version 0.1.\n\n";
+print "\nPerl Distribution Compactor for Perl Executing Browser\n\n";
+
+# Command-line argument:
+my $appimage_name = "";
+GetOptions(
+  "appimage_name=s" => \$appimage_name
+);
 
 # Directory paths:
 my $root = getcwd;
@@ -30,9 +37,11 @@
 my $bin_compacted;
 my $lib_compacted;
 
-if ($ARGV[0] and $ARGV[0] =~ /^--AppImage$/) {
-  $bin_compacted = catdir($root, "peb.app", "resources", "app", "perl", "bin");
-  $lib_compacted = catdir($root, "peb.app", "resources", "app", "perl", "lib");
+if (length($appimage_name) > 0) {
+  $bin_compacted = catdir(
+    $root, $appimage_name.".app", "resources", "app", "perl", "bin");
+  $lib_compacted = catdir(
+    $root, $appimage_name.".app", "resources", "app", "perl", "lib");
 } else {
   $bin_compacted = catdir($perl_directory, "bin-compacted");
   $lib_compacted = catdir($perl_directory, "lib-compacted");
@@ -87,7 +96,7 @@
 }
 
 # Rename Perl directories:
-if ($ARGV[0] and $ARGV[0] !~ /^--AppImage$/) {
+if (length($appimage_name) == 0) {
   rename $bin_original, catdir($perl_directory, "bin-original");
   rename $bin_compacted, catdir($perl_directory, "bin");