Merge branch 'master' of http://github.com/netblue30/firejail0.9.58

1 files changed, 10 insertions, 2 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 555643b6f..c08d3b2e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,12 @@
 # Basic notes: builds firejail on 5 different systems for 2 package systems:
 # 1. Debian-based systems. Use debian:jessie to ensure reasonable backwards
-# compat and ubuntu:latest for new setups
+# compat and ubuntu:rolling for new setups
 # 2. Redhat-based systems. Use centos:latest for reasonable backwards compat
 # and fedora:latest for new setups
 # 3. Alpine for installing directly from source
+# Also builds apparmor package for Ubuntu LTS
 build_ubuntu_package:
-    image: ubuntu:latest
+    image: ubuntu:rolling
     script:
     - apt-get update -qq
     - apt-get install -y -qq build-essential lintian
@@ -39,3 +40,10 @@ build_src_package:
         - apk upgrade
         - apk add build-base linux-headers
         - ./configure --prefix=/usr && make && make install-strip
+
+build_apparmor:
+  image: ubuntu:latest
+  script:
+    - apt-get update -qq
+    - apt-get install -y -qq build-essential lintian libapparmor-dev
+    - ./configure --prefix=/usr && make deb-apparmor && dpkg -i firejail-apparmor*.deb