diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml index c233d3c43..ae2249129 100644 --- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml @@ -53,8 +53,6 @@ jobs: IMAGE_NAME: ubuntu-22.04 PYTHON_VERSION: 3.8 TOXENV: integration-dns-rfc2136 - docker-dev: - TOXENV: docker_dev le-modification: IMAGE_NAME: ubuntu-22.04 TOXENV: modification diff --git a/Dockerfile-dev b/Dockerfile-dev deleted file mode 100644 index 7c7530305..000000000 --- a/Dockerfile-dev +++ /dev/null @@ -1,22 +0,0 @@ -# This Dockerfile builds an image for development. -FROM ubuntu:focal - -# Note: this only exposes the port to other docker containers. -EXPOSE 80 443 - -WORKDIR /opt/certbot/src - -COPY . . -# This does not include the dependencies needed to build cryptography. See -# https://cryptography.io/en/latest/installation/#building-cryptography-on-linux -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install apache2 git python3-venv \ - libaugeas0 nginx-light -y --no-install-recommends && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN VENV_NAME="../venv" python3 tools/venv.py - -ENV PATH /opt/certbot/venv/bin:$PATH diff --git a/certbot/docs/contributing.rst b/certbot/docs/contributing.rst index 552a338ec..6459fd68e 100644 --- a/certbot/docs/contributing.rst +++ b/certbot/docs/contributing.rst @@ -621,34 +621,3 @@ https://python-poetry.org/docs/dependency-specification/. If you want to learn more about the design used here, see ``tools/pinning/DESIGN.md`` in the Certbot repo. - -.. _docker-dev: - -Running the client with Docker -============================== - -You can use Docker Compose to quickly set up an environment for running and -testing Certbot. To install Docker Compose, follow the instructions at -https://docs.docker.com/compose/install/. - -.. note:: Linux users can simply run ``pip install docker-compose`` to get - Docker Compose after installing Docker Engine and activating your shell as - described in the :ref:`Getting Started ` section. - -Now you can develop on your host machine, but run Certbot and test your changes -in Docker. When using ``docker-compose`` make sure you are inside your clone of -the Certbot repository. As an example, you can run the following command to -check for linting errors:: - - docker-compose run --rm --service-ports development bash -c 'tox -e lint' - -You can also leave a terminal open running a shell in the Docker container and -modify Certbot code in another window. The Certbot repo on your host machine is -mounted inside of the container so any changes you make immediately take -effect. To do this, run:: - - docker-compose run --rm --service-ports development bash - -Now running the check for linting errors described above is as easy as:: - - tox -e lint diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 75a5b9aab..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '2' -services: - production: - build: . - ports: - - "443:443" - -# For development, mount git root to /opt/certbot/src in order to -# make the dev workflow more vagrant-like. - development: - build: - context: . - dockerfile: Dockerfile-dev - ports: - - "80:80" - - "443:443" - volumes: - - .:/opt/certbot/src - - /opt/certbot/venv diff --git a/tox.ini b/tox.ini index 33308b70d..166cb58a2 100644 --- a/tox.ini +++ b/tox.ini @@ -192,15 +192,6 @@ whitelist_externals = passenv = DOCKER_* -[testenv:docker_dev] -description = Tests the Dockerfile-dev file to ensure development with it works as expected -deps = -commands = - docker-compose run --rm --service-ports development bash -c 'tox -e lint' -whitelist_externals = - docker-compose -passenv = DOCKER_* - [testenv:integration] deps = -e acme