From: dklawren Date: Tue, 4 Feb 2020 22:25:41 +0000 (-0500) Subject: no bug - Docker development environent and documentation changes. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7478c73004e85641b2df918f582018105a7c5ca;p=thirdparty%2Fbugzilla.git no bug - Docker development environent and documentation changes. --- diff --git a/README.rst b/README.rst index ac0219b12..c0dfb99e3 100644 --- a/README.rst +++ b/README.rst @@ -272,7 +272,7 @@ to ensure that you have the correct docker setup. docker-compose up --build -Then, you must configure your browser to use http://localhost:1091 as an HTTP proxy. +Then, you must configure your browser to use localhost and port 1080 as an HTTP proxy. For setting a proxy in Firefox, see `Firefox Connection Settings`_. The procedure should be similar for other browsers. @@ -282,6 +282,17 @@ After that, you should be able to visit http://bmo.test/ from your browser. You can login as vagrant@bmo.test with the password "vagrant01!" (without quotes). +If you want to update the code running in the web container, you do not need to restart everything. +You can run the following command: + +.. code-block:: bash + + docker-compose exec bmo.test rsync -avz --exclude .git --exclude local /mnt/sync/ /app/ + +The Mojolicious morbo development server, used by the web container, will notice any code changes and +restart itself. + + Ensuring your Docker setup on Ubuntu 16.04 ========================================== diff --git a/docker-compose.yml b/docker-compose.yml index 0e59b3f3d..36ab67d02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,6 +35,7 @@ services: depends_on: - bmo.db - memcached + - tinyproxy bmo.jobqueue: build: *bmo_build @@ -93,6 +94,8 @@ services: volumes: - bmo-mysql-db:/var/lib/mysql - ./docker/mysql:/etc/mysql/conf.d + tmpfs: + - /tmp logging: driver: "none" environment: