Share the Docker image used for building AppImages

Author: niess

.travis.yml

@@ -15,10 +15,10 @@ matrix:
     - env: ARCH=x86_64
 
 install:
-  - docker build -t python-${ARCH} --build-arg Arch=${ARCH} .travis
+  - docker build -t ${DOCKER_USERNAME}/linuxdeploy-plugin-python:${ARCH} --build-arg Arch=${ARCH} .travis
 
 script:
-  - docker run --cap-add SYS_ADMIN --device /dev/fuse --mount src=$PWD,dst=/work,type=bind python-${ARCH}
+  - docker run --cap-add SYS_ADMIN --device /dev/fuse --mount src=$PWD,dst=/work,type=bind ${DOCKER_USERNAME}/linuxdeploy-plugin-python:${ARCH}
 
 after_success:
   - ./.travis/after-success.sh

.travis/Dockerfile

@@ -2,7 +2,9 @@ FROM ubuntu:trusty
 LABEL maintainer="https://github.com/niess"
 
 ARG Arch=x86_64
-ENV ARCH="${Arch}" OPENSSL="1.1.1c"
+ENV ARCH="${Arch}"                                                             \
+    OPENSSL="1.1.1c"                                                           \
+    OPENSSL_DIR="${HOME}/openssl/${OPENSSL}${CONFIG_HASH}"
 
 RUN apt update -y -qq                                                       && \
     apt install --no-install-recommends -y -qq                                 \
@@ -13,6 +15,13 @@ RUN apt update -y -qq                                                       && \
 
 COPY . /work/.travis
 WORKDIR /work
+SHELL ["/bin/bash", "-c"]
 
 RUN ./.travis/install.sh
-CMD ./.travis/script.sh
+
+ENV PATH="${OPENSSL_DIR}/bin:${PATH}"                                          \
+    CFLAGS="${CFLAGS} -I${OPENSSL_DIR}/include"                                \
+    LDFLAGS="-L${OPENSSL_DIR}/lib -Wl,-rpath=${OPENSSL_DIR}/lib"               \
+    LD_LIBRARY_PATH="${OPENSSL_DIR}/lib:${LD_LIBRARY_PATH}"
+
+CMD ["./.travis/script.sh"]

.travis/after-success.sh

@@ -1,5 +1,11 @@
 #! /bin/bash
 
+# Upload the AppImage
 ls -lh appimage/*.AppImage
 wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
 source upload.sh appimage/*.AppImage
+
+
+# Upload the Docker container
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+docker push $DOCKER_USERNAME/linuxdeploy-plugin-python:${ARCH}

.travis/install.sh

@@ -2,22 +2,18 @@
 
 set -ex
 
-# Download, compile, and install if it's not already present in cache
-if [ -n "${OPENSSL}" ]; then
-    source .travis/openssl-config.sh
-
-    wget --no-check-certificate -q "https://www.openssl.org/source/openssl-${OPENSSL}.tar.gz"
-    tar zxf "openssl-${OPENSSL}.tar.gz"
-    pushd "openssl-${OPENSSL}"
-    ./config $OPENSSL_CONFIG_FLAGS -fPIC --prefix="$OPENSSL_DIR"
-    make depend
-    make -j"$(nproc)"
-    if [[ "${OPENSSL}" =~ 1.0.1 ]]; then
-        # OpenSSL 1.0.1 doesn't support installing without the docs.
-        make install
-    else
-        # Avoid installing the docs
-        make install_sw install_ssldirs
-    fi
-    popd
+# Download, compile, and install openssl
+wget --no-check-certificate -q "https://www.openssl.org/source/openssl-${OPENSSL}.tar.gz"
+tar zxf "openssl-${OPENSSL}.tar.gz"
+pushd "openssl-${OPENSSL}"
+./config no-ssl2 no-ssl3 shared -fPIC --prefix="$OPENSSL_DIR"
+make depend
+make -j"$(nproc)"
+if [[ "${OPENSSL}" =~ 1.0.1 ]]; then
+    # OpenSSL 1.0.1 doesn't support installing without the docs.
+    make install
+else
+    # Avoid installing the docs
+    make install_sw install_ssldirs
 fi
+popd

.travis/openssl-config.sh

@@ -2,16 +2,6 @@
 
 set -ex
 
-
-if [ -n "${OPENSSL}" ]; then
-    source .travis/openssl-config.sh
-    export PATH="${OPENSSL_DIR}/bin:${PATH}"
-    export CFLAGS="${CFLAGS} -I${OPENSSL_DIR}/include"
-    export LDFLAGS="-L${OPENSSL_DIR}/lib -Wl,-rpath=${OPENSSL_DIR}/lib"
-    export LD_LIBRARY_PATH="${OPENSSL_DIR}/lib:${LD_LIBRARY_PATH}"
-fi
-
-
 ./appimage/build-plugin.sh
 ./appimage/build-python.sh python2
 ./appimage/build-python.sh python3