adds USDT trace points for supported distros

docker-library · Feb 2, 2019 · c524f2b · c524f2b
1 parent 408f7b8
commit c524f2b
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 0 deletions.
diff --git a/3.4/jessie/Dockerfile b/3.4/jessie/Dockerfile
@@ -34,6 +34,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -43,6 +45,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -54,6 +57,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.4/jessie/slim/Dockerfile b/3.4/jessie/slim/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		wget \
 		xz-utils \
@@ -66,6 +67,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \

diff --git a/3.4/stretch/Dockerfile b/3.4/stretch/Dockerfile
@@ -36,6 +36,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -45,6 +47,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -56,6 +59,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.4/stretch/slim/Dockerfile b/3.4/stretch/slim/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl1.0-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		wget \
 		xz-utils \
@@ -66,6 +67,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \

diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
@@ -34,6 +34,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -43,6 +45,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -54,6 +57,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.5/jessie/Dockerfile b/3.5/jessie/Dockerfile
@@ -34,6 +34,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -43,6 +45,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -54,6 +57,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.5/jessie/slim/Dockerfile b/3.5/jessie/slim/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		wget \
 		xz-utils \
@@ -66,6 +67,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \

diff --git a/3.5/stretch/Dockerfile b/3.5/stretch/Dockerfile
@@ -34,6 +34,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -43,6 +45,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -54,6 +57,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.5/stretch/slim/Dockerfile b/3.5/stretch/slim/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		wget \
 		xz-utils \
@@ -66,6 +67,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \

diff --git a/3.6/jessie/Dockerfile b/3.6/jessie/Dockerfile
@@ -34,6 +34,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -43,6 +45,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -54,6 +57,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.6/jessie/slim/Dockerfile b/3.6/jessie/slim/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		wget \
 		xz-utils \
@@ -66,6 +67,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \

diff --git a/3.6/stretch/Dockerfile b/3.6/stretch/Dockerfile
@@ -34,6 +34,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -43,6 +45,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -54,6 +57,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		wget \
 		xz-utils \
@@ -66,6 +67,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \

diff --git a/3.7/stretch/Dockerfile b/3.7/stretch/Dockerfile
@@ -35,6 +35,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -44,6 +46,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -55,6 +58,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/3.7/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		uuid-dev \
 		wget \
@@ -67,6 +68,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -31,6 +31,8 @@ RUN set -ex \
 	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
+	&& apt-get install -y --no-install-recommends systemtap-sdt-dev \
+	\
 	&& cd /usr/src/python \
 	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
@@ -40,6 +42,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--without-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \
@@ -51,6 +54,7 @@ RUN set -ex \
 			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python \
+	&& apt-get remove -y systemtap-sdt-dev \
 	\
 	&& python3 --version
 

diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
@@ -33,6 +33,7 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		systemtap-sdt-dev \
 		tk-dev \
 		uuid-dev \
 		wget \
@@ -61,6 +62,7 @@ RUN set -ex \
 		--with-system-expat \
 		--with-system-ffi \
 		--without-ensurepip \
+		--with-dtrace \
 	&& make -j "$(nproc)" \
 	&& make install \
 	&& ldconfig \