47562b4143
This patch introduces a new 'set_from_resource' config directive which allows defining a variable by retrieving its value from the X resource database. This avoids having to configure a color scheme in multiple files. The directive takes an additional fallback value which is used in case the resource cannot be found or during config validation where no X connection is available. Furthermore, this patch includes the following changes: - If the same variable is defined twice, we now properly overwrite the value of the assignment rather than inserting two variable definitions with the same key. - We now depend on xcb-util-xrm to query the resource. - Increase the buffer size for variable / resource assignments. fixes #2130
41 lines
1.8 KiB
Docker
41 lines
1.8 KiB
Docker
# vim:ft=Dockerfile
|
||
# Same as travis-base.Dockerfile, but without the test suite dependencies since
|
||
# we only build Debian packages on Ubuntu i386, we don’t run the tests.
|
||
FROM i386/ubuntu:wily
|
||
|
||
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
|
||
# Paper over occasional network flakiness of some mirrors.
|
||
RUN echo 'APT::Acquire::Retries "5";' > /etc/apt/apt.conf.d/80retry
|
||
|
||
# NOTE: I tried exclusively using gce_debian_mirror.storage.googleapis.com
|
||
# instead of httpredir.debian.org, but the results (Fetched 123 MB in 36s (3357
|
||
# kB/s)) are not any better than httpredir.debian.org (Fetched 123 MB in 34s
|
||
# (3608 kB/s)). Hence, let’s stick with httpredir.debian.org (default) for now.
|
||
|
||
# Install mk-build-deps (for installing the i3 build dependencies),
|
||
# clang and clang-format-3.5 (for checking formatting and building with clang),
|
||
# lintian (for checking spelling errors),
|
||
RUN linux32 apt-get update && \
|
||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||
dpkg-dev devscripts git equivs \
|
||
clang clang-format-3.5 \
|
||
lintian && \
|
||
rm -rf /var/lib/apt/lists/*
|
||
|
||
# Install i3 build dependencies.
|
||
COPY debian/control /usr/src/i3-debian-packaging/control
|
||
RUN linux32 apt-get update && \
|
||
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
|
||
rm -rf /var/lib/apt/lists/*
|
||
|
||
# Install xcb-util-xrm. This is a workaround until it is available in the
|
||
# distribution packages.
|
||
RUN apt-get update && \
|
||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xutils-dev
|
||
RUN git clone --recursive https://github.com/Airblader/xcb-util-xrm.git && \
|
||
cd xcb-util-xrm && \
|
||
./autogen.sh --prefix=/usr && \
|
||
make && \
|
||
make install && \
|
||
cd -
|