Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some debian package manager tweaks #1235

Merged
merged 9 commits into from
Mar 9, 2020
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Next steps should work on clear Ubuntu 18.04.
- Install necessary dependencies:

```sh
$ sudo apt update && apt install -y nodejs npm curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
$ sudo apt-get update && apt-get --no-install-recommends install -y nodejs npm curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
```

- Install [Visual Studio Code](https://code.visualstudio.com/docs/setup/linux#_debian-and-ubuntu-based-distributions)
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ ENV DJANGO_CONFIGURATION=${DJANGO_CONFIGURATION}

# Install necessary apt packages
RUN apt-get update && \
apt-get install -yq \
apt-get --no-install-recommends install -yq \
software-properties-common && \
add-apt-repository ppa:mc3man/xerus-media -y && \
add-apt-repository ppa:mc3man/gstffmpeg-keep -y && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -yq \
apache2 \
DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
apache2 \
Rajpratik71 marked this conversation as resolved.
Show resolved Hide resolved
apache2-dev \
apt-utils \
Rajpratik71 marked this conversation as resolved.
Show resolved Hide resolved
build-essential \
libapache2-mod-xsendfile \
supervisor \
ffmpeg \
Expand All @@ -44,7 +46,7 @@ RUN apt-get update && \
poppler-utils \
curl && \
curl https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
apt-get install -y git-lfs && git lfs install && \
apt-get --no-install-recommends install -y git-lfs && git lfs install && \
if [ -z ${socks_proxy} ]; then \
echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30\"" >> ${HOME}/.bashrc; \
else \
Expand Down
9 changes: 6 additions & 3 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - &
echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
curl https://deb.nodesource.com/setup_9.x | bash - && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -yq \
DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
apt-utils \
build-essential \
google-chrome-stable \
nodejs && \
nodejs \
python3-dev && \
rm -rf /var/lib/apt/lists/*;

RUN python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt
Expand All @@ -29,4 +32,4 @@ RUN mkdir -p tests && cd tests && npm install \
qunit; \
echo "export PATH=~/tests/node_modules/.bin:${PATH}" >> ~/.bashrc;

ENTRYPOINT []
ENTRYPOINT []
8 changes: 4 additions & 4 deletions components/cuda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
sudo add-apt-repository ppa:graphics-drivers/ppa
sudo apt-get update
sudo apt-cache search nvidia-* # find latest nvidia driver
sudo apt-get install nvidia-* # install the nvidia driver
sudo apt-get install mesa-common-dev
sudo apt-get install freeglut3-dev
sudo apt-get install nvidia-modprobe
sudo apt-get --no-install-recommends install nvidia-* # install the nvidia driver
sudo apt-get --no-install-recommends install mesa-common-dev
sudo apt-get --no-install-recommends install freeglut3-dev
sudo apt-get --no-install-recommends install nvidia-modprobe
```

#### Reboot your PC and verify installation by `nvidia-smi` command.
Expand Down
2 changes: 1 addition & 1 deletion components/openvino/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd /tmp/components/openvino
tar -xzf `ls | grep "openvino_toolkit"`
cd `ls -d */ | grep "openvino_toolkit"`

apt-get update && apt-get install -y sudo cpio && \
apt-get update && apt-get --no-install-recommends install -y sudo cpio && \
if [ -f "install_cv_sdk_dependencies.sh" ]; then ./install_cv_sdk_dependencies.sh; \
else ./install_openvino_dependencies.sh; fi && SUDO_FORCE_REMOVE=yes apt-get remove -y sudo

Expand Down
10 changes: 5 additions & 5 deletions cvat/apps/documentation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ server. Proxy is an advanced topic and it is not covered by the guide.

```sh
sudo apt-get update
sudo apt-get install -y \
sudo apt-get --no-install-recommends install -y \
apt-transport-https \
ca-certificates \
curl \
Expand All @@ -39,7 +39,7 @@ server. Proxy is an advanced topic and it is not covered by the guide.
$(lsb_release -cs) \
stable"
sudo apt-get update
sudo apt-get install -y docker-ce docker-ce-cli containerd.io
sudo apt-get --no-install-recommends install -y docker-ce docker-ce-cli containerd.io
```

- Perform [post-installation steps](https://docs.docker.com/install/linux/linux-postinstall/)
Expand All @@ -57,15 +57,15 @@ server. Proxy is an advanced topic and it is not covered by the guide.
defining and running multi-container docker applications.

```bash
sudo apt-get install -y python3-pip
sudo apt-get --no-install-recommends install -y python3-pip
sudo python3 -m pip install docker-compose
```

- Clone _CVAT_ source code from the
[GitHub repository](https://github.com/opencv/cvat).

```bash
sudo apt-get install -y git
sudo apt-get --no-install-recommends install -y git
git clone https://github.com/opencv/cvat
cd cvat
```
Expand Down Expand Up @@ -103,7 +103,7 @@ server. Proxy is an advanced topic and it is not covered by the guide.
curl https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
sudo apt-get update
sudo apt-get install -y google-chrome-stable
sudo apt-get --no-install-recommends install -y google-chrome-stable
```

- Open the installed Google Chrome browser and go to [localhost:8080](http://localhost:8080).
Expand Down