diff options
author | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
---|---|---|
committer | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
commit | 8f2ba2050ee78d0e4a47f1277c6bc4422d06170c (patch) | |
tree | c008d2878905e03df7a8bf8bd3330762cc2d8f43 /docker/Dockerfile | |
parent | bb55e121576a5b5d225bfc68c5062f386cc32db9 (diff) | |
parent | 3fc3ea6c6df237dbdf48d14703118b747bf5d647 (diff) | |
download | serial-barcode-scanner-8f2ba2050ee78d0e4a47f1277c6bc4422d06170c.tar.bz2 |
Merge branch 'master' into better_inventory
Conflicts:
README
data/templates/products/entry.html
docker/Dockerfile
docker/init.sh
src/database/database.vala
src/database/db-interface.vala
src/pdf-stock/Makefile
src/pdf-stock/pdf-stock-interface.vala
src/pdf-stock/pdf-stock.vala
src/web/Makefile
src/web/main.vala
templates/menu.html
templates/products/index.html
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r-- | docker/Dockerfile | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e75667f..c73cf1e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,45 +1,52 @@ -FROM debian:jessie +FROM debian:testing -RUN set -ex && \ - apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - wget \ +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + wget \ build-essential \ valac \ libesmtp-dev \ libgpgme11-dev \ libncursesw5-dev \ libncurses5-dev \ - libgee-dev \ libgmime-2.6-dev \ libarchive-dev \ libgstreamer1.0-dev \ - gstreamer1.0-alsa \ rygel-playbin \ librsvg2-dev \ libsqlite3-dev \ libpango1.0-dev \ libssl-dev \ + meson \ dbus-x11 \ fonts-lmodern \ sqlite3 \ libgtk2.0-dev \ libsoup2.4-dev \ libgee-0.8-dev \ + debhelper \ + dh-sysuser \ + libgmime-3.0-dev \ + udev \ tmux \ - mdbus2 \ - && rm -rf /var/lib/apt/lists/* + # neeed for apt install shopsystem + systemd console-setup console-setup-linux dbconfig-common dbconfig-sqlite3 gstreamer1.0-alsa gstreamer1.0-plugins-base iso-codes kbd keyboard-configuration libasound2 libasound2-data libcdparanoia0 \ + libgstreamer-plugins-base1.0-0 libjs-bootstrap libjs-c3 libjs-d3 libjs-jquery libjs-jquery-datatables libjs-jquery-flot libjs-jquery-mousewheel liblocale-gettext-perl libogg0 libopus0 liborc-0.4-0 \ + libpam-systemd libpolkit-agent-1-0 libpolkit-backend-1-0 libpolkit-gobject-1-0 libtheora0 libvisual-0.4-0 libvorbis0a libvorbisenc2 policykit-1 systemd-sysv sysuser-helper xkb-data \ + && rm -rf /var/lib/apt/lists/* - RUN set -ex && \ +RUN set -ex && \ useradd shop && \ mkdir /var/run/dbus ENV SBC_DIR /mnt/serial-barcode-scanner +WORKDIR $SBC_DIR COPY tmux-config /root/.tmux.conf COPY init.sh /root/ - -WORKDIR $SBC_DIR +COPY config.ini /root/ ENTRYPOINT ["/root/init.sh"] |