Skip to content

Commit

Permalink
ansible: add libcap-dev package to Linux distros
Browse files Browse the repository at this point in the history
This commit adds the libcap-dev package to linux distributions to
support the usage of Linux capabilities in Node.js.

Fixes: nodejs#2599
Refs: nodejs/node#37727
  • Loading branch information
danbev authored and richardlau committed Apr 9, 2021
1 parent 3e7f097 commit 14ef549
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 17 deletions.
20 changes: 10 additions & 10 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ packages: {
# centos-release-scl is required to enable SCLo but we do it manually in
# partials/repo/centos7.yml for arm64
centos7_arm64: ['git,python3'], # git2u not available for aarch64 (yet)
centos7_x64: ['devtoolset-6-libatomic-devel,git2u,centos-release-scl'],
centos7_ppc64: ['cmake3,devtoolset-6-libatomic-devel,git,python3'],
centos7_x64: ['devtoolset-6-libatomic-devel,git2u,centos-release-scl,libcap-devel'],
centos7_ppc64: ['cmake3,devtoolset-6-libatomic-devel,git,python3,libcap-devel'],

centos7: [
'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel',
'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel,libcap-devel',
],

aix: [
Expand All @@ -61,23 +61,23 @@ packages: {
],

debian8: [
'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo',
'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo,libcap-dev',
],

debian9: [
'gcc-6,g++-6,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo',
'gcc-6,g++-6,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,libcap-dev',
],

debian10: [
'gcc-8,g++-8,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
'gcc-8,g++-8,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip,libcap-dev',
],

fedora: [
'bzip2,ccache,gcc-c++,git,fontconfig,sudo,make',
'bzip2,ccache,gcc-c++,git,fontconfig,sudo,make,libcap-devel',
],

freebsd: [
'ccache,git,gmake,sudo,python3,py36-pip'
'ccache,git,gmake,sudo,python3,py36-pip,libcap-dev'
],

'macos10.10': [
Expand Down Expand Up @@ -115,7 +115,7 @@ packages: {
],

rhel7: [
'gcc-c++,sudo,git,zip,unzip,iptables-services,GConf2-devel,openssl-devel,python3',
'gcc-c++,sudo,git,zip,unzip,iptables-services,GConf2-devel,openssl-devel,python3,libcap-devel',
],

smartos: [
Expand Down Expand Up @@ -148,7 +148,7 @@ packages: {
],

ubuntu: [
'ccache,g++,gcc,g++-6,gcc-6,git,libfontconfig1,sudo,python3-pip',
'ccache,g++,gcc,g++-6,gcc-6,git,libfontconfig1,sudo,python3-pip,libcap-dev',
],

ubuntu1404: [
Expand Down
3 changes: 2 additions & 1 deletion ansible/roles/docker/templates/alpine311.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ RUN apk add --no-cache --virtual .build-deps \
bash \
automake \
libtool \
autoconf
autoconf \
libcap-dev

RUN pip3 install tap2junit

Expand Down
3 changes: 2 additions & 1 deletion ansible/roles/docker/templates/alpine312.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ RUN apk add --no-cache --virtual .build-deps \
bash \
automake \
libtool \
autoconf
autoconf \
libcap-dev

RUN pip3 install tap2junit

Expand Down
1 change: 1 addition & 0 deletions ansible/roles/docker/templates/ubi81.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN dnf install --disableplugin=subscription-manager -y \
python3 \
openssl-devel \
procps-ng \
libcap-devel \
&& dnf --disableplugin=subscription-manager clean all

RUN groupadd -r -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }} \
Expand Down
3 changes: 2 additions & 1 deletion ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
curl \
python-pip \
python3-pip \
libfontconfig1
libfontconfig1 \
libcap-dev

RUN pip install tap2junit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ RUN apt-get update \
gcc-4.9-multilib \
g++-4.9-multilib \
gcc-6-multilib \
g++-6-multilib
g++-6-multilib \
libcap-dev

RUN pip install tap2junit \
&& pip3 install tap2junit
Expand Down
3 changes: 2 additions & 1 deletion ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
curl \
python-pip \
python3-pip \
libfontconfig1
libfontconfig1 \
libcap-dev

RUN pip install tap2junit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ RUN apt-get update \
gcc-6-multilib \
g++-6-multilib \
gcc-8-multilib \
g++-8-multilib
g++-8-multilib \
libcap-dev

RUN pip install tap2junit \
&& pip3 install tap2junit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
curl \
python-pip \
python3-pip \
libfontconfig1
libfontconfig1 \
libcap-dev

RUN pip install tap2junit

Expand Down

0 comments on commit 14ef549

Please sign in to comment.