docker
/
docker-ubuntu-vnc-desktop
mirror of https://github.com/fcwu/docker-ubuntu-vnc-desktop
1
0
Fork 0
Code Issues Releases Activity

allow the opportunity to configure the apps installed

This commit is contained in:
Valentin Vieriu 2018-12-08 08:24:08 +01:00
parent f7c196f58b
commit 5140dc372e
3 changed files with 71 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEVELOPMENT.md
View File

@ -5,7 +5,11 @@ make run
``` ```
You can overwrite the local Ubuntu repo using `make LOCALBUILD=de build`. You can overwrite the local Ubuntu repo using `make LOCALBUILD=de build`.
You can run the image as adifferent user `make CUSTOM_USER=newuser run`. You can run the image as adifferent user `make CUSTOM_USER=newuser run`.
You can configure your own installed programs by using `APPS` env vriable and `BUILD_DEPS` if you need special dependencies to build those apps.
`make BUILD_DEPS="build-essential software-properties-common" APPS="vim-tiny net-tools zenity xz-utils firefox chromium-browser" run`
## develop backend ## develop backend
``` ```

63
Dockerfile.amd64
View File

@ -9,47 +9,48 @@ RUN echo "LOCALBUILD=$localbuild"
RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://'$localbuild'.archive.ubuntu.com/#' /etc/apt/sources.list; fi RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://'$localbuild'.archive.ubuntu.com/#' /etc/apt/sources.list; fi
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# && add-apt-repository ppa:fcwu-tw/apps x11vnc # What apps you would like to be installed
# built-in packages ARG APPS="vim-tiny net-tools zenity xz-utils firefox chromium-browser"
RUN apt-get update \ ENV APPS=$APPS
&& apt-get install -y --no-install-recommends software-properties-common curl apache2-utils \ ARG BUILD_DEPS="build-essential software-properties-common"
&& apt-get update \ ENV BUILD_DEPS=$BUILD_DEPS
&& apt-get install -y --no-install-recommends --allow-unauthenticated \
supervisor nginx sudo vim-tiny net-tools zenity xz-utils \
dbus-x11 x11-utils alsa-utils \
mesa-utils libgl1-mesa-dri \
lxqt openbox xvfb x11vnc \
gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf arc-theme \
firefox chromium-browser \
ttf-ubuntu-font-family ttf-wqy-zenhei \
&& add-apt-repository -r ppa:fcwu-tw/apps \
&& apt-get autoclean \
&& apt-get autoremove \
&& rm -rf /var/lib/apt/lists/*
# Additional packages require ~600MB # Additional packages require ~600MB
# libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw
# python library
COPY image/usr/local/lib/web/backend/requirements.txt /tmp/
RUN apt-get update \
&& apt-get install -y --no-install-recommends --allow-unauthenticated \
$BUILD_DEPS apache2-utils curl supervisor nginx sudo \
dbus-x11 x11-utils alsa-utils \
mesa-utils libgl1-mesa-dri \
lxqt openbox xvfb x11vnc \
gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf arc-theme \
ttf-ubuntu-font-family ttf-wqy-zenhei \
$APPS \
&& add-apt-repository -r ppa:fcwu-tw/apps \
&& dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
&& apt-get install -y python-dev python-pip \
&& pip install setuptools wheel && pip install -r /tmp/requirements.txt \
&& dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
&& apt-get remove -y python-pip `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
&& apt-get purge -y --auto-remove $BUILD_DEPS \
&& apt-get autoclean \
&& apt-get autoremove \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# tini for subreap # tini for subreap
ARG TINI_VERSION=v0.18.0 ARG TINI_VERSION=v0.18.0
ENV TINI_VERSION=$TINI_VERSION
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini
RUN chmod +x /bin/tini RUN chmod +x /bin/tini
# ffmpeg # ffmpeg
RUN mkdir -p /usr/local/ffmpeg \ RUN mkdir -p /usr/local/ffmpeg \
&& curl -sSL --http1.1 https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1 && curl -sSL --http1.1 https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1 \
&& rm -rf /usr/local/ffmpeg/manpages
# python library
COPY image/usr/local/lib/web/backend/requirements.txt /tmp/
RUN apt-get update \
&& dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
&& apt-get install -y python-pip python-dev build-essential \
&& pip install setuptools wheel && pip install -r /tmp/requirements.txt \
&& dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
&& apt-get remove -y `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
&& apt-get autoclean -y \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /var/cache/apt/* /tmp/a.txt /tmp/b.txt
################################################################################ ################################################################################

78
Dockerfile.armhf
View File

@ -11,56 +11,48 @@ ARG localbuild
RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://'$localbuild'.archive.ubuntu.com/#' /etc/apt/sources.list; fi RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http://'$localbuild'.archive.ubuntu.com/#' /etc/apt/sources.list; fi
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt update \ # What apps you would like to be installed
&& apt install -y --no-install-recommends software-properties-common curl apache2-utils \ ARG APPS="vim-tiny net-tools zenity xz-utils firefox chromium-browser"
&& apt update \ ENV APPS=$APPS
&& apt install -y --no-install-recommends --allow-unauthenticated \ ARG BUILD_DEPS="build-essential software-properties-common"
supervisor nginx sudo vim-tiny net-tools zenity xz-utils \ ENV BUILD_DEPS=$BUILD_DEPS
dbus-x11 x11-utils alsa-utils \
mesa-utils libgl1-mesa-dri \
&& add-apt-repository -r ppa:fcwu-tw/apps \
&& apt autoclean -y \
&& apt autoremove -y \
&& rm -rf /var/lib/apt/lists/*
# install debs error if combine together
RUN apt update \
&& apt install -y --no-install-recommends --allow-unauthenticated \
lxqt openbox xvfb x11vnc \
firefox chromium-browser \
ttf-ubuntu-font-family ttf-wqy-zenhei \
&& apt autoclean -y \
&& apt autoremove -y \
&& rm -rf /var/lib/apt/lists/*
RUN apt update \
&& apt install -y --no-install-recommends --allow-unauthenticated \
gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
&& apt autoclean -y \
&& apt autoremove -y \
&& rm -rf /var/lib/apt/lists/*
# Additional packages require ~600MB # Additional packages require ~600MB
# libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw
# tini for subreap # python library
COPY image/usr/local/lib/web/backend/requirements.txt /tmp/
RUN apt-get update \
&& apt-get install -y --no-install-recommends --allow-unauthenticated \
$BUILD_DEPS apache2-utils curl supervisor nginx sudo \
dbus-x11 x11-utils alsa-utils \
mesa-utils libgl1-mesa-dri \
lxqt openbox xvfb x11vnc \
gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf arc-theme \
ttf-ubuntu-font-family ttf-wqy-zenhei \
$APPS \
&& add-apt-repository -r ppa:fcwu-tw/apps \
&& dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
&& apt-get install -y python-dev python-pip \
&& pip install setuptools wheel && pip install -r /tmp/requirements.txt \
&& dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
&& apt-get remove -y python-pip `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
&& apt-get purge -y --auto-remove $BUILD_DEPS \
&& apt-get autoclean \
&& apt-get autoremove \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# tini for subreap
ARG TINI_VERSION=v0.18.0 ARG TINI_VERSION=v0.18.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-armhf /bin/tini ENV TINI_VERSION=$TINI_VERSION
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini
RUN chmod +x /bin/tini RUN chmod +x /bin/tini
# ffmpeg # ffmpeg
#RUN mkdir -p /usr/local/ffmpeg \ RUN mkdir -p /usr/local/ffmpeg \
# && curl -sSL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1 && curl -sSL --http1.1 https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1 \
&& rm -rf /usr/local/ffmpeg/manpages
# python library
COPY image/usr/local/lib/web/backend/requirements.txt /tmp/
RUN apt-get update \
&& dpkg-query -W -f='${Package}\n' > /tmp/a.txt \
&& apt-get install -y python-pip python-dev build-essential \
&& pip install setuptools wheel && pip install -r /tmp/requirements.txt \
&& dpkg-query -W -f='${Package}\n' > /tmp/b.txt \
&& apt-get remove -y `diff --changed-group-format='%>' --unchanged-group-format='' /tmp/a.txt /tmp/b.txt | xargs` \
&& apt-get autoclean -y \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /var/cache/apt/* /tmp/a.txt /tmp/b.txt
################################################################################ ################################################################################