lando: add lando functionality (bug 1885346)

README.md

@@ -6,7 +6,7 @@ system, collectively known as "Conduit".  This includes
 
 * BMO, Mozilla's Bugzilla fork
 * Phabricator, including extensions and patches
-* Lando, both API and UI
+* Lando
 * Transplant, the service that lands commits
 * A Mercurial server
 * A container ("local-dev") with various command-line tools including MozPhab
@@ -27,7 +27,7 @@ substitute for self-contained tests in individual repositories.
 1. You need to have [docker](https://docs.docker.com/install/) and
    [docker-compose](https://docs.docker.com/compose/install/) installed.
 1. For Lando, an Auth0 developer account. See the
-   [lando-ui README.md](https://github.com/mozilla-conduit/lando-ui/blob/master/README.md)
+   [lando README.md](https://github.com/mozilla-conduit/lando/blob/master/README.md)
    for instructions on how to set that up.
 
 ### Steps
@@ -39,6 +39,8 @@ substitute for self-contained tests in individual repositories.
   required for Lando and Transplant. If in doubt, please refer to the
   relevant projects.  Here is a sample file:
 
+XXX This example is outdated
+
 ```
 version: '3.4'
 services:
@@ -75,20 +77,12 @@ services:
 
 * Run `docker-compose build`
 
-### First run of Lando
-
-If you are running Lando, you will need to first initialize the database:
-
-```shell
-docker-compose exec lando-api lando-cli db upgrade
-```
-
 ## Using the local-dev service
 
 The "local-dev" container includes command-line tools used to interact
 with Conduit services.
 
-To set up the container run `docker-compose run local-dev`.
+To set up the container run `docker-compose run --rm local-dev`.
 You will be placed inside of a repository cloned from http://hg.test. You can
 use it as a normal local development repository.
 
@@ -119,10 +113,11 @@ proxy, or run a preconfigured Firefox.
 
 ### Websites provided by the suite
 
- * Phabricator - http://phabricator.test
- * Lando - http://lando-ui.test
- * Lando API - http://lando-api.test/ui via Swagger UI.
  * Bugzilla - http://bmo.test
+ * Phabricator - http://phabricator.test
+ * Lando - http://lando.test
+ * (Legacy) Lando - http://lando-ui.test
+ * (Legacy) Lando API - http://lando-api.test/ui via Swagger UI.
  * Mercurial - http://hg.test
 
 ## Running apps from local clone
@@ -142,11 +137,10 @@ repositories you wish to use locally to the `conduit` directory.
 ```shell
 git clone [email protected]:mozilla-conduit/arcanist.git
 git clone [email protected]:mozilla-bteam/bmo.git
-git clone [email protected]:mozilla-conduit/lando-api.git
-git clone [email protected]:mozilla-conduit/lando-ui.git
+git clone [email protected]:mozilla-conduit/lando.git
 git clone [email protected]:mozilla-conduit/phabricator.git
 git clone [email protected]:mozilla-conduit/phabricator-emails.git
-git clone [email protected]:mozilla-conduit/review.git
+git clone [email protected]:mozilla-conduit/review.git # moz-phab
 ```
 
 If you've installed all of the above projects, your directory structure
@@ -158,8 +152,7 @@ conduit
 ├── arcanist/
 ├── bmo/
 ├── suite/
-├── lando-api/
-├── lando-ui/
+├── lando/
 ├── phabricator/
 ├── phabricator-emails/
 └── review/
@@ -199,13 +192,12 @@ docker-compose \
   up --build -d
 ```
 
-And for example to work on lando-ui and lando-api,
+And for example to work on lando,
 
 ```shell
 docker-compose \
   -f docker-compose.yml \
-  -f docker-compose.lando-api.yml \
-  -f docker-compose.lando-ui.yml \
+  -f docker-compose.lando.yml \
   -f docker-compose.override.yml \
   up --build -d
 ```
@@ -220,11 +212,10 @@ of the ARC wrapper "review" , load the `docker-compose.review.yml`.
 
 If you don't want to spin up all configured containers, you can
 specify the ones you'd like to work on. The command below runs
-`phabricator.test`, `phabricator`, `phabdb`, `lando-api.test`,
-`lando-api` and `lando-api.db` to allow the verification of the
+`phabricator.test`, `phabricator`, `phab.db`, `lando.test`,
 integration between Phabricator and Lando API:
 
-`docker-compose up phabricator.test lando-api.test`
+`docker-compose up phabricator.test lando.test`
 
 ## Preconfigured users:
 
@@ -295,24 +286,23 @@ Start the suite:
 
 ```shell
 docker-compose up -d
-docker-compose exec lando-api lando-cli db upgrade
 ```
 
 Create a diff:
 
 ```shell
-$ docker-compose run local-dev
-# ./clone-repositories.sh
+$ docker-compose run --rm local-dev
+# cd repos
 # cd test-repo
 # echo test >> README
 # hg commit -m "test info added"
 # moz-phab install-certificate
 # moz-phab submit -b 1
 ```
 
-Log in to http://lando-ui.test.
+Log in to http://lando.test.
 
-Navigate to http://lando-ui.test/revisions/D2.
+Navigate to http://lando.test/revisions/D2.
 
 Confirm the warning and click on the `Land` button.
 

docker-compose.autolandhg.yml

@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-version: '3.4'
 services:
   autoland.hg-init:
     build:

docker-compose.bmo.yml

@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-version: '3.4'
-
 services:
   bmo.test:
     build:

docker-compose.cinnabarc.yml

@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-version: '3.4'
 services:
   local-dev:
     volumes: 

docker-compose.lando.yml

@@ -0,0 +1,68 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+services:
+  lando:
+    build:
+      context: ../lando/.
+    image: suite_lando
+    stdin_open: true
+    tty: true
+    command: bash -c "
+      lando generate_version_file &&
+      lando collectstatic --clear --no-input &&
+      lando migrate &&
+      lando setup_dev &&
+      lando runserver 0.0.0.0:80"
+    user: "${UID}:${GID}"  # needed for file generation in the mounted volumes
+    volumes:
+      - ../lando:/code
+      - ../lando/staticfiles:/staticfiles
+      - ../lando-prorotype/media:/mediafiles
+
+  lando.hg-landing-worker:
+    image: suite_lando
+    user: "${UID}:${GID}"  # needed for file generation in the mounted volumes
+    volumes:
+      - ../lando:/code
+      - ../lando/staticfiles:/staticfiles
+      - ../lando-prorotype/media:/mediafiles
+
+  lando.test:
+    build: ../lando/nginx
+    ports:
+      - 443:443
+    depends_on:
+      - lando
+    volumes:
+      - ../lando/staticfiles:/staticfiles
+      - ../lando/media:/mediafiles
+
+  lando.db:
+    image: postgres
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - 5432:5432
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "postgres", "-d", "postgres"]
+      interval: 1s
+      timeout: 1s
+      retries: 10
+
+  lando.redis:
+    image: redis:7.2
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+
+  lando.celery:
+    image: suite_lando
+    command: lando start_celery_worker
+    depends_on:
+      lando.redis:
+        condition: service_healthy
+
+volumes:
+  media:

docker-compose.phabricator.yml

@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-version: '3.4'
 services:
   phabricator:
     build:

docker-compose.review.yml

@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-version: '3.4'
 services:
   local-dev:
     command: bash -c "cd review && pip3 install -e . && cd ~ && bash"