From ceadb271c19ffe4db47c797c2fc29ab6c771c3ec Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Tue, 8 Oct 2019 13:43:24 +1100 Subject: [PATCH] storage --- docker/Dockerfile | 19 +++++++++++++++++++ docker/Dockerfile.kde | 12 ------------ docker/scripts/start.sh | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 13 deletions(-) delete mode 100644 docker/Dockerfile.kde diff --git a/docker/Dockerfile b/docker/Dockerfile index 3684c6d..d7c363b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:19.04 ENV USER jackson +ENV DISPLAY :0 ENV EDITOR nano ENV HOME /home/$USER ENV LANG en_US.UTF-8 @@ -140,6 +141,24 @@ RUN apt-get update -qq && \ wget -O /etc/fonts/local.conf -nv https://raw.githubusercontent.com/jessfraz/dockerfiles/master/chrome/stable/local.conf && \ groupadd --system chrome +# Install cloudstorage +RUN apt-get install -qq \ + autoconf \ + fuse3 \ + libcurl4-openssl-dev \ + libfuse3-dev \ + libjsoncpp-dev \ + libmicrohttpd-dev \ + libtinyxml2-dev \ + libtool \ + pkg-config && \ + git clone https://github.com/cloud-computer/libcloudstorage && \ + cd libcloudstorage && \ + ./bootstrap && \ + ./configure --with-curl --with-microhttpd --with-fuse && \ + make -j$(nproc) && \ + make install + # Install dive docker image explorer RUN wget -qnv -O dive.deb https://github.com/wagoodman/dive/releases/download/v0.7.2/dive_0.7.2_linux_amd64.deb && \ dpkg -i dive.deb && \ diff --git a/docker/Dockerfile.kde b/docker/Dockerfile.kde deleted file mode 100644 index 6e473a3..0000000 --- a/docker/Dockerfile.kde +++ /dev/null @@ -1,12 +0,0 @@ -FROM sabrehagen/desktop-environment:latest - -# Install kde plasma desktop environment -RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install -qq \ - kde-plasma-desktop - -# Record container build information -ARG DESKTOP_CONTAINER_BUILD_DATE -ARG DESKTOP_CONTAINER_GIT_SHA -ENV CONTAINER_BUILD_DATE $DESKTOP_CONTAINER_BUILD_DATE -ENV CONTAINER_GIT_SHA $DESKTOP_CONTAINER_GIT_SHA diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index 0ddcbe6..729a395 100755 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -11,11 +11,48 @@ docker network create $DESKTOP_ENVIRONMENT_DOCKER_NETWORK # Start the desktop environment container docker run \ - --cap-add ALL \ --cap-add NET_ADMIN \ --cap-add SYS_PTRACE \ + --cap-add AUDIT_CONTROL \ + --cap-add AUDIT_READ \ + --cap-add AUDIT_WRITE \ + --cap-add BLOCK_SUSPEND \ + --cap-add CHOWN \ + --cap-add DAC_OVERRIDE \ + --cap-add DAC_READ_SEARCH \ + --cap-add FOWNER \ + --cap-add FSETID \ + --cap-add IPC_LOCK \ + --cap-add IPC_OWNER \ + --cap-add KILL \ + --cap-add LEASE \ + --cap-add LINUX_IMMUTABLE \ + --cap-add MAC_ADMIN \ + --cap-add MAC_OVERRIDE \ + --cap-add MKNOD \ + --cap-add NET_ADMIN \ + --cap-add NET_BIND_SERVICE \ + --cap-add NET_BROADCAST \ + --cap-add NET_RAW \ + --cap-add SETGID \ + --cap-add SETFCAP \ + --cap-add SETPCAP \ + --cap-add SETUID \ + --cap-add SYS_ADMIN \ + --cap-add SYS_BOOT \ + --cap-add SYS_CHROOT \ + --cap-add SYS_MODULE \ + --cap-add SYS_NICE \ + --cap-add SYS_PACCT \ + --cap-add SYS_PTRACE \ + --cap-add SYS_RAWIO \ + --cap-add SYS_RESOURCE \ + --cap-add SYS_TIME \ + --cap-add SYS_TTY_CONFIG \ + --cap-add SYSLOG \ --detach \ --device /dev/dri \ + --device /dev/fuse \ --device /dev/input \ --device /dev/snd \ --device /dev/tty1 \