Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Don’t install netcat. 

It’s been unused since commit 0af22dad18
(#13239).

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-09-02 19:40:56 -07:00 committed by Tim Abbott
parent 81b6583d28
commit d751e0cece
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/manifests/base.pp
View File

@ -27,8 +27,6 @@ class zulip::base {
'crudini', 'crudini',
# Used for tools like sponge # Used for tools like sponge
'moreutils', 'moreutils',
# Used in scripts
'netcat',
# Nagios monitoring plugins # Nagios monitoring plugins
$zulip::common::nagios_plugins, $zulip::common::nagios_plugins,
# Required for using HTTPS in apt repositories. # Required for using HTTPS in apt repositories.

2
tools/ci/Dockerfile.template
View File

@ -39,7 +39,7 @@ RUN apt-get update \
locales \ locales \
xvfb \ xvfb \
parallel \ parallel \
netcat unzip zip jq \ unzip zip jq \
python3-pip \ python3-pip \
&& ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime \ && ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime \
&& {{ locale-gen en_US.UTF-8 || true; }} \ && {{ locale-gen en_US.UTF-8 || true; }} \

1
tools/lib/provision.py
View File

@ -144,7 +144,6 @@ UBUNTU_COMMON_APT_DEPENDENCIES = [
"redis-server", "redis-server",
"hunspell-en-us", "hunspell-en-us",
"puppet-lint", "puppet-lint",
"netcat", # Used for flushing memcached
"default-jre-headless", # Required by vnu-jar "default-jre-headless", # Required by vnu-jar
*THUMBOR_VENV_DEPENDENCIES, *THUMBOR_VENV_DEPENDENCIES,
] ]

2
tools/test-install/prepare-base
View File

@ -46,7 +46,7 @@ run apt-get dist-upgrade -y
# As an optimization, we install a bunch of packages the installer # As an optimization, we install a bunch of packages the installer
# would install for itself. # would install for itself.
run apt-get install -y --no-install-recommends \ run apt-get install -y --no-install-recommends \
xvfb parallel netcat unzip zip jq python3-pip wget curl eatmydata \ xvfb parallel unzip zip jq python3-pip wget curl eatmydata \
git crudini openssl ssl-cert \ git crudini openssl ssl-cert \
build-essential python3-dev \ build-essential python3-dev \
memcached redis-server \ memcached redis-server \