Skip to content

Commit 0dcc9e7

Browse files
Support new OS distro Debian 11 (Bullseye). (#139)
* Add build Dockerfile for Debian 11. * Add Debian control file for Debian 11 Bullseye; fix Debian rules for Buster and Bullseye.
1 parent c6a0747 commit 0dcc9e7

File tree

4 files changed

+53
-2
lines changed

4 files changed

+53
-2
lines changed

build/x86_64_bullseye/Dockerfile

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
FROM debian:bullseye
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get -y update \
5+
&& apt-get -y install \
6+
autoconf \
7+
automake \
8+
bison \
9+
debhelper \
10+
debian-keyring \
11+
default-jdk \
12+
default-libmysqlclient-dev \
13+
devscripts \
14+
flex \
15+
gcc \
16+
git \
17+
libcurl4-openssl-dev \
18+
libhiredis-dev \
19+
libltdl-dev \
20+
libmongoc-dev \
21+
libpq-dev \
22+
libpq5 \
23+
libssl-dev \
24+
libtool \
25+
libvarnishapi-dev \
26+
libyajl-dev \
27+
make \
28+
pkg-config \
29+
python2-dev \
30+
python3-dev \
31+
&& apt-get -y clean \
32+
&& rm -rf /var/lib/apt/lists/*

deb/debian/controls/control.bullseye

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Source: stackdriver-agent
2+
Maintainer: Stackdriver Agents <[email protected]>
3+
Section: misc
4+
Priority: optional
5+
Standards-Version: 3.9.2
6+
Build-Depends: autoconf, automake, debhelper (>= 7.0.50), default-jdk, default-libmysqlclient-dev, libcurl4-openssl-dev, libhiredis-dev (>= 0.10.0), libltdl-dev, libssl-dev, libtool, libyajl-dev, lsb-release, pkg-config
7+
8+
Package: stackdriver-agent
9+
Architecture: any
10+
Depends: ${shlibs:Depends}, ${misc:Depends}, curl, libcurl4, libltdl7, libyajl2
11+
Suggests: default-jre, libhiredis0.14, libmariadb3
12+
Description: Stackdriver system metrics collection daemon
13+
The Stackdriver system metrics daemon collects system statistics and
14+
sends them to the Stackdriver service.
15+
Currently includes collectd.
16+

deb/debian/controls/control.buster

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build-Depends: autoconf, automake, debhelper (>= 7.0.50), default-jdk, default-l
88
Package: stackdriver-agent
99
Architecture: any
1010
Depends: ${shlibs:Depends}, ${misc:Depends}, curl, libcurl4, libltdl7, libyajl2
11-
Suggests: default-jre, libhiredis0.13, libmariadbclient18
11+
Suggests: default-jre, libhiredis0.14, libmariadb3
1212
Description: Stackdriver system metrics collection daemon
1313
The Stackdriver system metrics daemon collects system statistics and
1414
sends them to the Stackdriver service.

deb/debian/rules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ ARCH := $(shell uname -m)
55
DISTRO=$(shell lsb_release -a 2>/dev/null |grep Codename |awk {'printf $$2;'})
66
debian_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
77

8-
ifneq (,$(filter $(DISTRO),buster stretch))
8+
ifneq (,$(filter $(DISTRO),stretch))
99
HIREDIS=libhiredis0.13
1010
MYSQL=libmariadbclient18
11+
else ifneq (,$(filter $(DISTRO),bullseye buster))
12+
HIREDIS=libhiredis0.14
13+
MYSQL=libmariadb3
1114
else ifneq (,$(filter $(DISTRO),xenial bionic))
1215
HIREDIS=libhiredis0.13
1316
MYSQL=libmysqlclient20

0 commit comments

Comments
 (0)