Removed requirement for root privileges (#35)

Also fixed warning `debconf: unable to initialize frontend:...`
morevnaproject · Feb 14, 2022 · c2a48f7 · c2a48f7
1 parent 56fd07c
commit c2a48f7
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 140 deletions.
diff --git a/docker/build.sh b/docker/build.sh
@@ -4,5 +4,5 @@ DIRNAME=`dirname "$0"`
 cd $DIRNAME
 DIRNAME=`pwd`
 
-sudo ./linux-64/build.sh
-sudo ./linux-32/build.sh
+./linux-64/build.sh
+./linux-32/build.sh
diff --git a/docker/linux-32/Dockerfile b/docker/linux-32/Dockerfile
@@ -1,82 +1,82 @@
 FROM i386/debian:stretch
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        libssl1.0.2 openssl libgnutls30 \
-        autoconf                                       \
-        automake                                       \
-        autotools-dev                                  \
-        bc                                             \
-        binfmt-support                                 \
-        build-essential                                \
-        ccache                                         \
-        clang                                          \
-        curl                                           \
-        devscripts                                     \
-        gdb                                            \
-        git-core                                       \
-        libtool                                        \
-        llvm                                           \
-        mercurial                                      \
-        multistrap                                     \
-        patch                                          \
-        software-properties-common                     \
-        subversion                                     \
-        wget                                           \
-        xz-utils                                       \
-        cmake                                          \
-        qemu-user-static                               \
-        libxml2-dev                                    \
-        lzma-dev                                       \
-        openssl                                        \
-        libssl-dev                                     \
-        pkg-config \
-        csh \
-        xsltproc \
-        m4 \
-        automake \
-        autopoint \
-        intltool \
-        libtool \
-        libltdl-dev \
-        git \
-        # qt deps see: http://doc.qt.io/qt-5/linux-requirements.html \
-        libxrender-dev \
-        libfontconfig1-dev \
-        libfreetype6-dev \
-        libxi-dev \
-        libxext-dev \
-        libx11-dev \
-        libx11-xcb-dev \
-        libsm-dev \
-        libice-dev \
-        libglu1-mesa-dev \
-        # other deps \
-        libegl1-mesa-dev \
-        libdirectfb-dev \
-        liblzma-dev \
-        liblzo2-dev \
-        libudev-dev \
-        libfuse-dev \
-        libdb-dev \
-        libasound2-dev \
-        libffi-dev \
-        libmount-dev \
-        libbz2-dev \
-        libdbus-1-dev \
-        libcroco3-dev \
-        libpthread-stubs0-dev \
-        libxau-dev \
-        libxcursor-dev \
-        flex \
-        bison \
-        python-dev \
-        libxtst-dev \
-        xutils-dev \
-        # for synfigstudio-nsis \
-        unzip \
-        # for portable versions \
-        zip \
- && apt-get clean
- 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+libssl1.0.2 openssl libgnutls30 \
+autoconf \
+automake \
+autotools-dev \
+bc \
+binfmt-support \
+build-essential \
+ccache \
+clang \
+curl \
+devscripts \
+gdb \
+git-core \
+libtool \
+llvm \
+mercurial \
+multistrap \
+patch \
+software-properties-common \
+subversion \
+wget \
+xz-utils \
+cmake \
+qemu-user-static \
+libxml2-dev \
+lzma-dev \
+openssl \
+libssl-dev \
+pkg-config \
+csh \
+xsltproc \
+m4 \
+automake \
+autopoint \
+intltool \
+libtool \
+libltdl-dev \
+git \
+# qt deps see: http://doc.qt.io/qt-5/linux-requirements.html \
+libxrender-dev \
+libfontconfig1-dev \
+libfreetype6-dev \
+libxi-dev \
+libxext-dev \
+libx11-dev \
+libx11-xcb-dev \
+libsm-dev \
+libice-dev \
+libglu1-mesa-dev \
+# other deps \
+libegl1-mesa-dev \
+libdirectfb-dev \
+liblzma-dev \
+liblzo2-dev \
+libudev-dev \
+libfuse-dev \
+libdb-dev \
+libasound2-dev \
+libffi-dev \
+libmount-dev \
+libbz2-dev \
+libdbus-1-dev \
+libcroco3-dev \
+libpthread-stubs0-dev \
+libxau-dev \
+libxcursor-dev \
+flex \
+bison \
+python-dev \
+libxtst-dev \
+xutils-dev \
+# for synfigstudio-nsis \
+unzip \
+# for portable versions \
+zip \
+&& apt-get clean
+
 CMD ["/bin/bash"]
 WORKDIR /workdir
diff --git a/docker/linux-32/build.sh b/docker/linux-32/build.sh
@@ -4,4 +4,4 @@ DIRNAME=`dirname "$0"`
 cd $DIRNAME
 DIRNAME=`pwd`
 
-sudo docker build -t morevnaproject/builds-32 ./
+docker build -t morevnaproject/builds-32 ./
diff --git a/docker/linux-64/Dockerfile b/docker/linux-64/Dockerfile
@@ -1,60 +1,57 @@
 FROM multiarch/crossbuild
 
-RUN apt-get update \
- && apt-get install -y -q \
-        pkg-config \
-        csh \
-        xsltproc \
-        m4 \
-        automake \
-        autopoint \
-        intltool \
-        libtool \
-        libltdl-dev \
-        git \
-        # qt deps see: http://doc.qt.io/qt-5/linux-requirements.html \
-        libxrender-dev \
-        libfontconfig1-dev \
-        libfreetype6-dev \
-        libxi-dev \
-        libxext-dev \
-        libx11-dev \
-        libx11-xcb-dev \
-        libsm-dev \
-        libice-dev \
-        libglu1-mesa-dev \
-        # other deps \
-        libegl1-mesa-dev \
-        libdirectfb-dev \
-        liblzma-dev \
-        liblzo2-dev \
-        libudev-dev \
-        libfuse-dev \
-        libdb-dev \
-        libasound2-dev \
-        libffi-dev \
-        libmount-dev \
-        libbz2-dev \
-        libdbus-1-dev \
-        libcroco3-dev \
-        libpthread-stubs0-dev \
-        libxau-dev \
-        libxcursor-dev \
-        flex \
-        bison \
-        python-dev \
-        libxtst-dev \
-        xutils-dev \
-        # for synfigstudio-nsis \
-        unzip \
-        # for portable versions \
-        zip \
- && apt-get clean
-
+RUN apt-get update && \
+DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
+pkg-config \
+csh \
+xsltproc \
+m4 \
+automake \
+autopoint \
+intltool \
+libtool \
+libltdl-dev \
+git \
+# qt deps see: http://doc.qt.io/qt-5/linux-requirements.html \
+libxrender-dev \
+libfontconfig1-dev \
+libfreetype6-dev \
+libxi-dev \
+libxext-dev \
+libx11-dev \
+libx11-xcb-dev \
+libsm-dev \
+libice-dev \
+libglu1-mesa-dev \
+# other deps \
+libegl1-mesa-dev \
+libdirectfb-dev \
+liblzma-dev \
+liblzo2-dev \
+libudev-dev \
+libfuse-dev \
+libdb-dev \
+libasound2-dev \
+libffi-dev \
+libmount-dev \
+libbz2-dev \
+libdbus-1-dev \
+libcroco3-dev \
+libpthread-stubs0-dev \
+libxau-dev \
+libxcursor-dev \
+flex \
+bison \
+python-dev \
+libxtst-dev \
+xutils-dev \
+# for synfigstudio-nsis \
+unzip \
+# for portable versions \
+zip \
 # fix ca-certificates issue - https://github.com/multiarch/crossbuild/issues/63
-# RUN apt-get -yq update
-# RUN apt-get -yq upgrade
-RUN apt-get -yq install libssl1.0.2 openssl libgnutls30
+libssl1.0.2 openssl libgnutls30 \
+&& apt-get clean
 
 # Image metadata
 ENTRYPOINT ["/usr/bin/crossbuild"]

diff --git a/docker/linux-64/build.sh b/docker/linux-64/build.sh
@@ -4,4 +4,4 @@ DIRNAME=`dirname "$0"`
 cd $DIRNAME
 DIRNAME=`pwd`
 
-sudo docker build -t morevnaproject/builds-64 ./
+docker build -t morevnaproject/builds-64 ./
diff --git a/run.sh b/run.sh
@@ -30,7 +30,7 @@ if [[ "$PLATFORM" == "linux" ]] && [[ "$ARCH" == "32" ]]; then
     SETARCH="setarch i686"
 else
     #DOCKER_IMAGE="multiarch/crossbuild"
-    # sudo docker build -t morevnaproject/builds-64 .
+    # docker build -t morevnaproject/builds-64 .
     DOCKER_IMAGE="morevnaproject/builds-64"
     # ATTENTION! The NATIVE_PLATFORM should not be equal to PLATFORM ("linux"), otherwise bad things happen.
     NATIVE_PLATFORM="debian"
@@ -40,10 +40,9 @@ fi
 
 $SCRIPT_DIR/docker/linux-$NATIVE_ARCH/build.sh
 
+# FUSE required for AppImage
 docker run --rm \
-    --privileged \
-    --device /dev/fuse \
-    --cap-add SYS_ADMIN \
+    --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined \
     -v $(pwd):/workdir \
     -v "$PACKET_BUILD_DIR:/build/packet" \
     -v "$SCRIPT_BUILD_DIR:/build/script" \