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

setup-apt-repos: Don’t install lsb_release. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2022-02-12 13:55:07 -08:00 committed by Alex Vandiver
parent 45f4db9702
commit f6a701090c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/zulip_ops/files/teleport_node.yaml
View File

@ -16,7 +16,8 @@ ssh_service:
command: ["/usr/bin/uptrack-uname", "-r"] command: ["/usr/bin/uptrack-uname", "-r"]
period: 1h0m0s period: 1h0m0s
- name: distro - name: distro
command: ["/usr/bin/lsb_release", "-ds"] command:
["/bin/sh", "-c", '. /etc/os-release && printf "%s\n" "$PRETTY_NAME"']
period: 1h0m0s period: 1h0m0s
- name: classes - name: classes
command: command:

2
scripts/lib/setup-apt-repo
View File

@ -83,7 +83,7 @@ fi
# Hash to check if the configuration is changed by the script later. # Hash to check if the configuration is changed by the script later.
hashes=$(sha256sum "$SOURCES_FILE" "$PREF_FILE" 2>/dev/null || true) hashes=$(sha256sum "$SOURCES_FILE" "$PREF_FILE" 2>/dev/null || true)
pre_setup_deps=(lsb-release apt-transport-https ca-certificates gnupg curl) pre_setup_deps=(apt-transport-https ca-certificates gnupg curl)
if ! apt-get -dy install "${pre_setup_deps[@]}"; then if ! apt-get -dy install "${pre_setup_deps[@]}"; then
apt-get update apt-get update
fi fi

1
tools/setup/dev-vagrant-docker/Dockerfile
View File

@ -11,7 +11,6 @@ RUN echo locales locales/default_environment_locale select C.UTF-8 | debconf-set
ca-certificates \ ca-certificates \
curl \ curl \
locales \ locales \
lsb-release \
openssh-server \ openssh-server \
python3 \ python3 \
sudo \ sudo \