Do not use docker Python libraries

We use the main docker instead

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

CHANGELOG.rst

@@ -7,6 +7,7 @@ Version (next)
 - Add Pipeline to flag ghost packages (#1533)
 - Add logging configuration (#1533)
 - Drop support for python 3.8 (#1533)
+- Drop using docker-compose and use the built-in "docker compose" instead
 
 
 Version v34.0.0

Makefile

@@ -129,9 +129,9 @@ docs:
 
 docker-images:
 	@echo "-> Build Docker services"
-	docker-compose build
+	docker compose build
 	@echo "-> Pull service images"
-	docker-compose pull
+	docker compose pull
 	@echo "-> Save the service images to a compressed tar archive in the dist/ directory"
 	@mkdir -p dist/
 	@docker save postgres vulnerablecode_vulnerablecode nginx | gzip > dist/vulnerablecode-images-`git describe --tags`.tar.gz

README.rst

@@ -66,18 +66,18 @@ Getting started
 Run with Docker
 ^^^^^^^^^^^^^^^^
 
-First install docker and docker-compose, then run::
+First install docker, then run::
 
     git clone https://github.com/nexB/vulnerablecode.git && cd vulnerablecode
     make envfile
-    docker-compose build
-    docker-compose up -d
-    docker-compose run vulnerablecode ./manage.py import --list
+    docker compose build
+    docker compose up -d
+    docker compose run vulnerablecode ./manage.py import --list
 
 Then run an importer for nginx advisories (which is small)::
 
-    docker-compose exec vulnerablecode ./manage.py import vulnerabilities.importers.nginx.NginxImporter
-    docker-compose exec vulnerablecode ./manage.py improve --all
+    docker compose exec vulnerablecode ./manage.py import vulnerabilities.importers.nginx.NginxImporter
+    docker compose exec vulnerablecode ./manage.py improve --all
 
 At this point, the VulnerableCode app and API should be up and running with
 some data at http://localhost

docs/source/installation.rst

@@ -45,20 +45,20 @@ create an environment file, and build the Docker image::
 
     git clone https://github.com/nexB/vulnerablecode.git && cd vulnerablecode
     make envfile
-    docker-compose build
+    docker compose build
 
 .. note::
 
     The image will need to be re-built when the VulnerableCode app source code is
     modified or updated via
-    ``docker-compose build --no-cache vulnerablecode``
+    ``docker compose build --no-cache vulnerablecode``
 
 Run the App
 ^^^^^^^^^^^
 
 **Run your image** as a container::
 
-    docker-compose up
+    docker compose up
 
 
 At this point, the VulnerableCode app should be running at port ``8000`` on your Docker host.
@@ -90,15 +90,15 @@ Execute a Command
 You can execute a one of ``manage.py`` commands through the Docker command line
 interface, for example::
 
-    docker-compose run vulnerablecode ./manage.py import --list
+    docker compose run vulnerablecode ./manage.py import --list
 
 .. note::
     Refer to the :ref:`command_line_interface` section for the full list of commands.
 
 Alternatively, you can connect to the Docker container ``bash`` and run commands
 from there::
 
-    docker-compose run vulnerablecode bash
+    docker compose run vulnerablecode bash
     ./manage.py import --list
 
 

requirements.txt

@@ -33,8 +33,6 @@ django-filter==21.1
 djangorestframework==3.13.1
 django-widget-tweaks==1.4.12
 doc8==0.11.1
-docker==5.0.3
-dockerpty==0.4.1
 docopt==0.6.2
 docutils==0.17.1
 drf-spectacular==0.24.2