diff options
| author | Simon Steinbeiß <ochosi@xfce.org> | 2020-06-25 00:51:49 +0200 |
|---|---|---|
| committer | Simon Steinbeiß <ochosi@xfce.org> | 2020-06-25 00:51:49 +0200 |
| commit | 8fb443963bb6851a9e82b531dcd93b6c9a2fcd14 (patch) | |
| tree | b16e9804d6d4b33609b6aa1fc6b076c9369ca719 | |
| parent | caa7aca47d8a9d217e78f4846122b63c3905938d (diff) | |
| download | xfce4-dev-tools-8fb443963bb6851a9e82b531dcd93b6c9a2fcd14.tar.gz | |
xfce-build: Replace build-dep with package names
Also take further measures to make the container slimmer and more portable.
Thanks to Romain and Florian (schuellerf/xfce-test)!
| -rw-r--r-- | Dockerfile | 11 | ||||
| -rw-r--r-- | ci/build_libs.sh | 6 |
2 files changed, 10 insertions, 7 deletions
@@ -7,12 +7,11 @@ ENV DEBIAN_FRONTEND noninteractive RUN sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list # Set up dependencies for the "xfce" and "app" groups -RUN apt-get update -RUN apt-get -y --no-install-recommends install libglib2.0-dev git libtool m4 automake intltool libx11-dev libgtk-3-dev libxfce4util-dev libxfce4ui-2-dev libwnck-3-dev libexo-2-dev gobject-introspection libgirepository1.0-dev \ - && apt-get -y --no-install-recommends build-dep xfce4-panel thunar xfce4-settings xfce4-session xfdesktop4 xfwm4 xfce4-appfinder tumbler \ - && apt-get -y --no-install-recommends build-dep catfish gigolo mousepad parole ristretto xfburn xfce4-dict xfce4-notifyd xfce4-screensaver xfce4-screenshooter xfce4-taskmanager xfce4-terminal \ - && apt-get -y --no-install-recommends build-dep xfce4-clipman-plugin \ - && apt-get -y --no-install-recommends install libmpd-dev valac libdbusmenu-gtk3-dev +RUN apt-get update \ + && apt-get -y --no-install-recommends install git libglib2.0-bin build-essential libgtk-3-dev gtk-doc-tools libx11-dev libglib2.0-dev libwnck-3-dev intltool liburi-perl x11-xserver-utils libvte-2.91-dev dbus-x11 cmake libsoup2.4-dev libpcre2-dev libgtksourceview-3.0-dev libtag1-dev \ + && apt-get -y --no-install-recommends install gir1.2-gstreamer-1.0 libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libgstreamer-plugins-base1.0-dev libgstreamer1.0-0 libgstreamer1.0-dev \ + python-distutils-extra libxss-dev libindicator3-dev libxmu-dev libburn-dev libisofs-dev libpulse-dev libkeybinder-3.0-dev libmpd-dev valac libvala-0.48-dev gobject-introspection libgirepository1.0-dev librsvg2-dev libtagc0-dev libdbusmenu-gtk3-dev libgtop2-dev libtool libnotify-dev libxklavier-dev libexif-dev libgudev-1.0-dev libupower-glib-dev \ + && rm -rf /var/lib/apt/lists/* # Build and install the latest tag for all Xfce core libraries RUN mkdir /git diff --git a/ci/build_libs.sh b/ci/build_libs.sh index 6cedec5..2853951 100644 --- a/ci/build_libs.sh +++ b/ci/build_libs.sh @@ -37,5 +37,9 @@ for URL in ${REPOS}; do ./autogen.sh $AUTOGEN_OPTIONS make -j${NPROC:-$(nproc)} make install - echo "$(pwd): $(git describe)" >> /git/xfce_build_version_info.txt + echo "$(pwd): $(git describe)" >> /tmp/xfce_build_version_info.txt done + +# cleanup +rm -rf /git/* +mv /tmp/xfce_build_version_info.txt /git/ |