Optimize Dockerfile (#108)

Author: jld3103

Dockerfile

@@ -1,94 +1,84 @@
 FROM snapcore/snapcraft AS snapcraft
 # Using multi-stage dockerfile to obtain snapcraft binary
 
+FROM ubuntu:bionic AS flutterbuilder
+RUN apt-get update \
+    && apt-get install -y \
+        git curl unzip
+# Install Flutter from the beta channel
+RUN git clone --single-branch --depth=1 --branch beta https://github.com/flutter/flutter /opt/flutter 2>&1 \
+    && /opt/flutter/bin/flutter doctor -v
+
 FROM ubuntu:bionic AS xarbuilder
 RUN apt-get update \
 	&& apt-get install -y \
-		wget tar libssl1.0-dev libxml2-dev make g++
-RUN cd /tmp \
-	&& wget https://github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz 2>&1 \
-	&& tar -zxvf xar-1.6.1.tar.gz 2>&1 \
-	&& mv xar-1.6.1 xar \
-	&& cd xar \
+		git libssl1.0-dev libxml2-dev make g++ autoconf
+RUN git clone --single-branch --depth=1 --branch xar-1.6.1 https://github.com/mackyle/xar 2>&1 \
+	&& cd xar/xar \
+	&& ./autogen.sh --noconfigure \
 	&& ./configure 2>&1 \
 	&& make 2>&1 \
 	&& make install 2>&1
 
-FROM dockercore/golang-cross:1.13.10 AS hover
+FROM ubuntu:bionic AS bomutilsbuilder
+RUN apt-get update \
+	&& apt-get install -y \
+	    git make g++
+RUN git clone --single-branch --depth=1 --branch 0.2 https://github.com/hogliux/bomutils 2>&1 \
+	&& cd bomutils \
+	&& make 2>&1 \
+	&& make install 2>&1
 
-# Add dart apt repository
-RUN wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - 2>&1 \
-	&& wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list
+# Fixed using https://github.com/AppImage/AppImageKit/issues/828
+FROM ubuntu:bionic as appimagebuilder
+RUN apt-get update \
+	&& apt-get install -y \
+	    curl
+RUN cd /opt \
+	&& curl -LO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage \
+	&& chmod a+x appimagetool-x86_64.AppImage \
+	&& sed 's|AI\x02|\x00\x00\x00|g' -i appimagetool-x86_64.AppImage \
+	&& ./appimagetool-x86_64.AppImage --appimage-extract \
+	&& mv squashfs-root appimagetool
+
+FROM dockercore/golang-cross:1.13.10 AS hover
 
 # Install dependencies via apt
 RUN apt-get update \
-	&& apt-get upgrade -y \
 	&& apt-get install -y \
-		# why is gnupg-agent needed? Can this be removed??
-		gnupg-agent \
-		# for what command are these dependencies??
+	    # dependencies for compiling linux
 		libgl1-mesa-dev xorg-dev \
-		# dependencies for flutter
-		dart unzip \
 		# dependencies for darwin-bundle
 		icnsutils \
 		# dependencies for darwin-dmg
 		genisoimage \
 		# dependencies for darwin-pkg
 		cpio git \
-		# dependencies for linux-appimage
-		libglib2.0-0 curl file \
 		# dependencies for linux-rpm
 		rpm \
-		# dependencies for linux-snap
-		locales \
 		# dependencies for windows-msi
 		wixl imagemagick \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& ln -sf /usr/lib/dart/bin/pub /usr/bin/pub
+	&& rm -rf /var/lib/apt/lists/*
+
+COPY --from=snapcraft /snap /snap
+ENV PATH="/snap/bin:$PATH"
+ENV SNAP="/snap/snapcraft/current"
+ENV SNAP_NAME="snapcraft"
+ENV SNAP_ARCH="amd64"
 
-# Install darwin-pkg dependencies
-# TODO, optimization: make bomutils in a separate stage, copy binaries/libs, like xar.
-RUN cd /tmp \
-	&& git clone https://github.com/hogliux/bomutils 2>&1 \
-	&& cd bomutils \
-	&& make 2>&1 \
-	&& make install 2>&1
 COPY --from=xarbuilder /usr/local/bin/xar /usr/local/bin/xar
 COPY --from=xarbuilder /usr/local/lib/libxar.so.1 /usr/local/lib/libxar.so.1
 COPY --from=xarbuilder /usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0 /usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
 
-# Install linux-appimage dependencies
-# Fixed using https://github.com/AppImage/AppImageKit/issues/828
-RUN cd /opt \
-	&& curl -LO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage \
-	&& chmod a+x appimagetool-x86_64.AppImage \
-	&& sed 's|AI\x02|\x00\x00\x00|g' -i appimagetool-x86_64.AppImage \
-	&& ./appimagetool-x86_64.AppImage --appimage-extract \
-	&& mv squashfs-root appimagetool \
-	&& rm appimagetool-x86_64.AppImage
-ENV PATH=/opt/appimagetool/usr/bin:$PATH
+COPY --from=bomutilsbuilder /usr/bin/mkbom /usr/bin/mkbom
 
-# Install linux-snap dependencies (based on https://hub.docker.com/r/snapcore/snapcraft/dockerfile)
-COPY --from=snapcraft /snap/core /snap/core
-COPY --from=snapcraft /snap/snapcraft /snap/snapcraft
-COPY --from=snapcraft /snap/bin/snapcraft /snap/bin/snapcraft
-# RUN locale-gen en_US.UTF-8 # TODO: remove locales from apt install above or re-enable these env vars
-# ENV LANG="en_US.UTF-8"
-# ENV LANGUAGE="en_US:en"
-# ENV LC_ALL="en_US.UTF-8"
-ENV PATH="/snap/bin:$PATH"
-ENV SNAP="/snap/snapcraft/current"
-ENV SNAP_NAME="snapcraft"
-ENV SNAP_ARCH="amd64"
-# RUN dpkg-reconfigure locales
+COPY --from=appimagebuilder /opt/appimagetool /opt/appimagetool
+ENV PATH=/opt/appimagetool/usr/bin:$PATH
 
 # TODO: Add pacman pkg packaging
 
-# Install Flutter from the beta channel
-RUN git clone --single-branch --depth=1 --branch beta https://github.com/flutter/flutter /opt/flutter 2>&1 \
-	&& ln -sf /opt/flutter/bin/flutter /usr/bin/flutter \
-	&& flutter doctor -v
+COPY --from=flutterbuilder /opt/flutter /opt/flutter
+RUN ln -sf /opt/flutter/bin/flutter /usr/bin/flutter
 
 # Build hover
 WORKDIR /go/src/app