Merge pull request #6 from linuxdeploy/centos6

Build on CentOS 6

Author: TheAssassin

.travis.yml

@@ -1,27 +1,15 @@
 language: cpp
-sudo: required
 
-#plugins:
-#  apt:
-#    update: true
+services:
+  - docker
 
 matrix:
   include:
     - env: ARCH=x86_64
     - env: ARCH=i386
-      addons:
-        apt:
-          update: true
-          packages:
-            - gcc-multilib
-            - g++-multilib
-            - zlib1g:i386
-            - libfuse2:i386
-            - libffi-dev
-            - libcairo2:i386
 
 script:
-  - bash -xe travis/build-appimage.sh
+  - bash -xe travis/build-docker.sh
 
 after_success:
   - ls -lh

travis/Dockerfile

@@ -0,0 +1,12 @@
+FROM centos:6
+
+SHELL ["/bin/bash", "-x", "-c"]
+
+RUN yum install -y centos-release-scl-rh && \
+    yum install -y devtoolset-7 wget curl patchelf vim-common fuse libfuse2 libtool autoconf automake zlib-devel libjpeg-devel libpng-devel nano git && \
+    wget https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.tar.gz -O- | tar xz --strip-components=1 -C/usr/local
+
+ENV ARCH=x86_64
+COPY entrypoint.sh /
+SHELL ["/entrypoint.sh", "bash", "-x", "-c"]
+ENTRYPOINT ["/entrypoint.sh"]

travis/Dockerfile.i386

@@ -0,0 +1,30 @@
+FROM i386/centos:6
+
+SHELL ["/bin/bash", "-x", "-c"]
+
+# during Docker build, yum doesn't detect it's an i386 environment on x86_64 machines, and tries to install x86_64 packages, which can't work
+# this little command fixes this
+RUN sed -i 's/$basearch/i386/g' /etc/yum.repos.d/CentOS-Base.repo
+
+# thanks CloudLinux, you're really helping us poor AppImage creators seeking for maximum compatibility by providing devtoolset i386 builds
+RUN yum install -y yum-utils && \
+    rpm --import https://repo.cloudlinux.com/cloudlinux/security/RPM-GPG-KEY-CloudLinux && \
+    yum-config-manager --add-repo https://www.repo.cloudlinux.com/cloudlinux/6/sclo/devtoolset-7/i386/ && \
+    yum install -y devtoolset-7 wget curl patchelf vim-common fuse libfuse2 libtool autoconf automake zlib-devel libjpeg-devel libpng-devel nano git
+
+# the shell wrapper takes care of enabling devtoolset and running a shell properly
+# unfortunately this is the easiest and most solid workaround to the limitations of the scl command
+COPY entrypoint.sh /
+ENV ARCH=i386
+ENTRYPOINT ["/entrypoint.sh"]
+SHELL ["/entrypoint.sh", "bash", "-x", "-c"]
+
+# old git doesn't support cloning tags with -b, therefore cloning remote HEAD and then manually checking out the requested tag
+RUN git clone https://github.com/Kitware/CMake && \
+    cd CMake && \
+    git checkout v3.14.3 && \
+    ./configure --prefix=/usr/local --parallel=$(nproc) && \
+    make -j$(nproc) all && \
+    make install && \
+    cd .. && \
+    rm -r CMake/

travis/build-appimage.sh

@@ -44,20 +44,26 @@ make install DESTDIR=AppDir
 AIK_ARCH="$ARCH"
 [ "$ARCH" == "i386" ] && AIK_ARCH="i686"
 
-wget https://github.com/TheAssassin/linuxdeploy/releases/download/continuous/linuxdeploy-"$ARCH".AppImage
-chmod +x linuxdeploy-"$ARCH".AppImage
+wget https://github.com/TheAssassin/linuxdeploy/releases/download/continuous/linuxdeploy-centos6-"$ARCH".AppImage
+chmod +x linuxdeploy-centos6-"$ARCH".AppImage
 
 # bundle appimagetool
 wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-"$AIK_ARCH".AppImage
+
 chmod +x appimagetool-"$AIK_ARCH".AppImage
+
+sed -i 's/AI\x02/\x00\x00\x00/' {appimagetool,linuxdeploy}*.AppImage
+
 ./appimagetool-"$AIK_ARCH".AppImage --appimage-extract
 mv squashfs-root/ AppDir/appimagetool-prefix/
 ln -s ../../appimagetool-prefix/AppRun AppDir/usr/bin/appimagetool
 
 export UPD_INFO="gh-releases-zsync|linuxdeploy|linuxdeploy-plugin-appimage|continuous|linuxdeploy-plugin-appimage-$ARCH.AppImage"
 
 # deploy linuxdeploy-plugin-appimage
-./linuxdeploy-"$ARCH".AppImage --appdir AppDir -d "$REPO_ROOT"/resources/linuxdeploy-plugin-appimage.desktop \
+sed -i 's|AI\x02|\x00\x00\x00|' linuxdeploy-centos6-"$ARCH".AppImage
+./linuxdeploy-centos6-"$ARCH".AppImage --appimage-extract-and-run \
+     --appdir AppDir -d "$REPO_ROOT"/resources/linuxdeploy-plugin-appimage.desktop \
     -i "$REPO_ROOT"/resources/linuxdeploy-plugin-appimage.svg
 
 AppDir/AppRun --appdir AppDir

travis/build-docker.sh

@@ -0,0 +1,18 @@
+#! /bin/bash
+
+set -xe
+
+old_cwd=$(readlink -f .)
+here=$(readlink -f $(dirname "$0"))
+
+DOCKERFILE="$here"/Dockerfile
+IMAGE=linuxdeploy-plugin-appimage-build
+
+if [ "$ARCH" == "i386" ]; then
+    DOCKERFILE="$DOCKERFILE".i386
+    IMAGE="$IMAGE".i386
+fi
+
+(cd "$here" && docker build -f "$DOCKERFILE" -t "$IMAGE" .)
+
+docker run --rm -it -v "$here"/..:/ws:ro -v "$old_cwd":/out -e CI=1 -e OUTDIR_OWNER=$(id -u) "$IMAGE" /bin/bash -xe -c "cd /out && /ws/travis/build-appimage.sh"

travis/entrypoint.sh

@@ -0,0 +1,9 @@
+#! /bin/bash
+
+# get a compiler that allows for using modern-ish C++ (>= 11) on a distro that doesn't normally support it
+# before you ask: yes, the binaries will work on CentOS 6 even without devtoolset (they somehow partially link C++
+# things statically while using others from the system...)
+# so, basically, it's magic!
+source /opt/rh/devtoolset-*/enable
+
+exec "$@"