Specify Linux build targets

.github/workflows/main.yml

@@ -68,6 +68,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REF: ${{ github.event.ref }}
+          BUILD_TARGETS: AppImage,deb,tar.gz,rpm
+          NODELIBCURL_BUILD_STATIC: yes
   Ubuntu16:
     name: Ubuntu 14
     runs-on: ubuntu-16.04
@@ -79,3 +81,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REF: ${{ github.event.ref }}
+          BUILD_TARGETS: snap
+          NODELIBCURL_BUILD_STATIC: yes

docker/Dockerfile.Ubuntu14

@@ -1,15 +0,0 @@
-FROM ubuntu:14.04
-
-ADD docker/install-dependencies.sh /scripts/install-dependencies.sh
-RUN /scripts/install-dependencies.sh
-
-# Setup dirs
-ADD . /src/insomnia
-WORKDIR /src/insomnia
-VOLUME /src/insomnia/packages/insomnia-app/dist
-
-ADD docker/bootstrap.sh /scripts/bootstrap.sh
-RUN /scripts/bootstrap.sh
-
-# Define build command
-CMD npm run app-package

docker/Dockerfile.Ubuntu16

@@ -1,15 +0,0 @@
-FROM ubuntu:16.04
-
-ADD docker/install-dependencies.sh /scripts/install-dependencies.sh
-RUN /scripts/install-dependencies.sh && apt-get install -y snapcraft
-
-# Setup dirs
-ADD . /src/insomnia
-WORKDIR /src/insomnia
-VOLUME /src/insomnia/packages/insomnia-app/dist
-
-ADD docker/bootstrap.sh /scripts/bootstrap.sh
-RUN /scripts/bootstrap.sh
-
-# Define build command
-CMD npm run app-package

docker/bootstrap.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Fail on any errors
-set -e
-
-# Install root project dependencies
-npm run bootstrap
-npm install --no-save 7zip-bin-linux app-builder-bin-linux
-

docker/install-dependencies.sh

@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-# Fail on any errors
-set -e
-
-# Install core deps
-apt-get update
-apt-get upgrade -y
-apt-get install -y \
-    build-essential \
-    autoconf \
-    libtool \
-    pkg-config \
-    libfontconfig1-dev \
-    rpm \
-    wget
-
-# Install Node and app-related dependencies
-wget -O- https://deb.nodesource.com/setup_10.x | bash -
-apt-get install -y nodejs graphicsmagick icnsutils
-
-# Build zlib from source (for Curl)
-wget -q https://github.com/madler/zlib/archive/v1.2.11.tar.gz -O ./zlib.tar.gz
-mkdir -p /src/zlib /build/zlib
-tar -xf zlib.tar.gz -C /src/zlib --strip 1
-cd /src/zlib
-./configure --prefix=/build/zlib
-make
-make install
-ldconfig
-
-# Build OpenSSL from source (for Curl)
-wget -q https://github.com/openssl/openssl/archive/OpenSSL_1_1_0h.tar.gz -O ./openssl.tar.gz
-mkdir -p /src/openssl /build/openssl
-tar -xf openssl.tar.gz -C /src/openssl --strip 1
-cd /src/openssl
-./config no-shared --static --prefix=/build/openssl --openssldir=/build/openssl
-make
-make install
-ldconfig
-
-# Build nghttp2 from source (for Curl)
-wget -q https://github.com/nghttp2/nghttp2/releases/download/v1.31.1/nghttp2-1.31.1.tar.gz -O ./nghttp2.tar.gz
-mkdir -p /src/nghttp2 /build/nghttp2
-tar -xf nghttp2.tar.gz -C /src/nghttp2 --strip 1
-cd /src/nghttp2
-CFLAGS="-fPIC" ./configure --enable-lib-only --disable-shared --prefix=/build/nghttp2
-make
-make install
-ldconfig
-
-# Build Curl from source
-wget -q https://github.com/curl/curl/releases/download/curl-7_61_1/curl-7.61.1.tar.gz -O ./curl.tar.gz
-mkdir -p /src/curl
-tar -xf curl.tar.gz -C /src/curl --strip 1
-cd /src/curl
-./buildconf
-LIBS="-ldl" CPPFLAGS="-I/build/openssl/include" LDFLAGS="-L/build/openssl/lib" \
-    ./configure \
-        --disable-shared \
-        --enable-static \
-        --with-ssl=/build/openssl \
-        --with-nghttp2=/build/nghttp2 \
-        --with-zlib=/build/zlib \
-        --enable-ipv6 \
-        --enable-unix-sockets
-make
-make install
-ldconfig
-curl --version