Status

RESOLVED FIXED
3 years ago
6 months ago

People

(Reporter: robhudson, Assigned: jgmize)

Tracking

({in-triage})

Details

(Reporter)

Description

3 years ago
MDN is in the early stages of moving to AWS. Part of this move is to get kuma and kumascript running in Docker as that is the deployment method of choice.

Other benefits include using the Docker support for Travis and a nice, easy to set up dev environment that will more closely match production.
Assignee: nobody → robhudson
Keywords: in-triage
(Reporter)

Updated

3 years ago
Blocks: 1110799
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/e0ba3ec2c8cf041e6ed1e82b530bf5fdb7d457a2
Bug 1218563 - Complete docker set up.

This adds celery support (with Redis broker) and nginx.

https://github.com/mozilla/kuma/commit/642071bb37c2661353c77760f01c7d6e95546d8c
Merge pull request #3778 from robhudson/docker

Bug 1218563 - Complete docker set up.
(Reporter)

Comment 3

3 years ago
With the last commit I consider the Docker set up completed.

The docker setup deviates from production and the vagrant VM in the following ways. These changes may also happen with the move to AWS.

* It uses Redis as a celery broker instead of AMQP.
* It uses nginx as a webserver instead of Apache.

Areas that could still use improvement:

* Documentation. I will leave this bug open and write some documentation soon.
* The Apache based rewrite rules have not been ported over.
* There are a few manual steps currently. Things like importing a database or running the migrations if you don't have a data dump, and running `update_product_details`.
(Reporter)

Comment 9

3 years ago
Unassigning myself. This isn't 100% complete but it's a good start for a dev environment.

Things that I know about that still need some work:
* Add kumascript. I would do this as another container and link it to the web container.
* Add SSL certs for https://
Assignee: robhudson → nobody
Assigning to jgmize, who is taking on this project.

He's identified an old version of django-pipeline as a potential issue. In debug mode, pipeline watches CSS and JS source files and rebuilds then when they change, to speed front-end development.  On Linux host systems, this is a fast process, but file sharing between the host and containers in Docker on OS X and Windows is a slow operation, and can make development annoyingly slow.

This was fixed recently in Bedrock by, among other things, upgrading django-pipeline [1]. The package upgrade work could be done in bug 1277577. Bedrock uses gulp for processing files, so some translation to stylus is needed.

[1] https://github.com/mozilla/bedrock/pull/4151
Assignee: nobody → jmize
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/e2f94ac6930777a9a8990ed89837980ebcaac507
bug 1218563: add kuma_base image

Add make push-base, tag-latest, push-latest

Disable elasticsearch, add kumascript to compose

Use 4 gunicorn procs locally

Upgrade django-pipeline to 1.6.8

Disable usage of supervisor in docker-compose by default
Switch to cssmin due to incompatibility with cleancss
Disable DEBUG by default in soon-to-be-deprecated settings/local.py

Comment out unused nginx container

Use default mysql root password set in Dockerfile

Use kuma_base in Dockerfile

Add build and push commands to Makefile

Collectstatic and update product_details at build

Use -f flag when tagging latest

Add compilecss and compilejsi18n to Dockerfile

Fix base CMD

Create build/locale during make collectstatic

Move build/locale creation to compilejsi18n

Add build-static to Makefile & use in Dockerfile

Delete build dir after make build-static

Reduce docker image size

run update_product_details before build-static

Add make pull-base and pull-kuma

Add 'make pull-latest'

Switch to requirements/default.txt

https://github.com/mozilla/kuma/commit/60965d66c238b7d352835a60b764da4d0cc7913b
bug 1218563: Uncomment requirements

https://github.com/mozilla/kuma/commit/493e9c946888f01f984da175cc918a503dd480ff
bug 1218563: Restore kuma/core/pipeline/__init__

https://github.com/mozilla/kuma/commit/41ffe58f9a8da2ab4c789244476f188ecf32f8ce
bug 1218563: Sync setuptools w/ system

https://github.com/mozilla/kuma/commit/558c35847897ca2e2b15eacd3cf65ad782b1cfdc
bug 1218563: Default DEBUG=True in local settings

Use a default of DEBUG=True in Vagrant local development, but allow
overriding on the command for Docker and the future.

https://github.com/mozilla/kuma/commit/d9a34010194c778a1d65944ce13f7af9cf6cf71a
bug 1218563: Set PIPELINE from the environment

Set compressor engines and engine parameters from the environment. If
the environment override is blank, then do not set the parameter.

https://github.com/mozilla/kuma/commit/0f7f0b3cfcac506a14af441c64c1b30f6a8cb46d
Merge pull request #3959 from mozilla/docker-base-1218563

Bug 1218563 - Add new Docker config based on kuma_base
See Also: → bug 1301867
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/427c1961d8d7d4b890091997582bc79a7e9c50e4
bug 1218563: Add basic install docs for Docker

Update the Docker installation documents for the new Docker environment,
and get them to the "view the homepage" step in the Vagrant
documentation.

https://github.com/mozilla/kuma/commit/92d7ba4347e8cb51e4352d3fb06169022206f15a
Merge pull request #3970 from mozilla/basic_install_1218563

bug 1218563: Add basic install docs for Docker
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/8e25f25541102d0662d7aa1b0401347cdc6b916b
bug 1218563: Alphabetize environment

https://github.com/mozilla/kuma/commit/90b67eb692cc9e09ccd74a8b87e291931deeac80
bug 1218563: Add docs for "Create an admin user"

The admin user has to have password login at this stage of the
development environment.  Because we're not using SSL, additional
settings, like CSRF_COOKIE_SECURE and SESSION_COOKIE_SECURE must be
turned off so the password form and sessions will work.

https://github.com/mozilla/kuma/commit/226d94cecbcb5905542bbccc1ddd80985a1035a0
bug 1218563: Add docs, "Enable the wiki"

These are similar to the Vagrant instructions, but I've reworded them a
little.

https://github.com/mozilla/kuma/commit/09641f23d1251c5e7ec1360836a2260dfa60b260
bug 1218563: Set MySQL charset/collation to utf8

Set the default character set to utf8 and the collation to our custom
collation utf8_general_ci.  This will also set the character set and
collation of the database created on a fresh start.

https://github.com/mozilla/kuma/commit/4b0931246bf21420acbfb594b83b564333817067
bug 1218563: Add docs, "Enable KumaScript"

https://github.com/mozilla/kuma/commit/152d3c0ea30c1732085de7d6d1e61c148b239e5b
bug 1218563: Add docs, Enable GitHub Auth

A few more environment variable overrides are needed to run in the
development environment without SSL.

Since this is the last of the "Installation" instructions, moved "Coming
Soon" to a "Current Status" section at the top of the page.

https://github.com/mozilla/kuma/commit/d7c4d640238ce30ba75cf8fb2d45d93cae21de54
bug 1218563: Add docs, generate assets and locales

The Docker environment doesn't yet include automatic building of static
assets, on startup or changes, so it needs to be done manually. Adjusted
the instructions from a full run of the docs.

https://github.com/mozilla/kuma/commit/180f28fa2805518354b91471574e310bff586fa4
Merge pull request #3975 from mozilla/advanced_install_1218563

Bug 1218563: Advanced install instructions

First draft r=jgmize
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/a5760eb7c50364dd4fec208228f133491d819941
bug 1218563: Document docker-compose -p kuma

If the user picks a different name for their working copy, then the
containers will pick up the different name and the commands won't be
cut-and-paste anymore. Document the issue, and a work-around with
docker-compose -p kuma.

https://github.com/mozilla/kuma/commit/b659e2e8af99c633f85f06c93dcf43816a18a852
bug 1218563: Update development docs for Docker

Update the development documentation to refer to either the Vagrant or
the Docker environments, pointing out differences as needed.

https://github.com/mozilla/kuma/commit/e4c6158fed12889bd847644a5b9339e401c4993e
bug 1218563: Add "make bash" and other utils

https://github.com/mozilla/kuma/commit/c8139c46fa0cf7d3b426194b574f86af6cea3223
bug 1218563: Use make bash, etc. in dev doc

https://github.com/mozilla/kuma/commit/501d5e5165272d68eeb317fa0feed790bc03ec60
bug 1218563: Add ElasticSearch to Docker

https://github.com/mozilla/kuma/commit/7f4d90c308276a1251ba45ca06006336b21ca85d
bug 1218563: Tests pass in Docker

The tests pass, but are very slow, taking 842 seconds to execute.

https://github.com/mozilla/kuma/commit/4d4fa80c41db1b40222cdfad9bae3c7a2683fc1f
bug 1218563: Disable pipeline in Vagrant dev

Previously, the django-pipeline settings PIPELINE_ENABLED and
PIPELINE_COLLECTOR_ENABLED were unset, and were set to default values at
runtime (Off for DEBUG=True, on for DEBUG=False in production).

The Docker configuration sets them explictly, either from environment
variables or the documented defaults.

The Vagrant dev environment starts with DEBUG=False, and then resets it
to DEBUG=True in settings/local, but not until the pipeline is enabled
for production.

This code updates the Vagrant settings that get set to production
defaults, and adds a note that local.py has a short life remaining.

https://github.com/mozilla/kuma/commit/43b7cdfed1f581f0ead0cbcbc6cdac47c97247a1
bug 1218563: Remove docs, PIPELINE_ENABLED=0

The PIPELINE_ENABLED=false workaround is not needed in Vagrant

https://github.com/mozilla/kuma/commit/0fd68f2dc1b63aca6a838d76e882a95aa93d4661
Merge pull request #3978 from mozilla/docker_dev_docs_1218563

Bug 1218563: Update Development docs for Docker
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/e0320be123c61d49fc896bf84631eb9597aed701
bug 1218563: Enable page rendering in Docker

* Update KumaScript to current master, which includes setting the
  configuration from the command like.
* Add a new api service to handle KumaScript requests, allowing the
  docker-compose v1 linking to work correctly
* Allow environment override of the setting KUMASCRIPT_URL_TEMPLATE
* Configure kumascript service for rendering pages and caching responses

https://github.com/mozilla/kuma/commit/edebdf8e21f1b0e9ab4901494f1b18a26a48d500
Merge pull request #3980 from mozilla/kumascript_1218563

Bug 1218563: Enable page rendering in Docker
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/bdd283ee9a0673462f7756cec4a252a6ce6d015e
bug 1218563: Adjust headers in development docs

Flatten and reword the sections under Advanced Configuration.

https://github.com/mozilla/kuma/commit/7e6c2e7102793bdf6332148a1edf6dbf92425f18
bug 1218563: Add Docker to Troubleshooting docs

Update Troubleshooting documents, including adding a Kuma Reset section
that should work for Docker.

https://github.com/mozilla/kuma/commit/e73131d9e40eee4940ecab48417993050e3cf56d
Merge pull request #3988 from mozilla/docs_troubleshooting_1218563

bug 1218563: Update Troubleshooting Doc
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/be8fc26432a2e2bb6c2a464e46de9ba61107423b
bug 1218563: Upgrade to docker-compose v2 format

This is the minimum change needed for the compose v2 format:

* Add "version: '2'"
* Move everything under "services", making the diff look more extreme
  than it is

https://github.com/mozilla/kuma/commit/b63086df96166582329dae2e5d1bc340028afbf0
bug 1218563: docker-compose v2 links to depends_on

https://github.com/mozilla/kuma/commit/0de5c0068ad5366428363a216a9f58315352caa4
bug 1218563: Use named volume for mysql container

Instead of a data container, create and use a named volume to store the
MySQL database.  The Docker community suggests this method, but the
Docker docs still suggest data-only containers.

http://stackoverflow.com/a/20652410/10612
https://github.com/docker/docker/issues/20465

https://github.com/mozilla/kuma/commit/bdbe515cab98da4fca0a110e2b50152749cda45c
Merge pull request #3982 from mozilla/docker_compose_v2_1218563

bug 1218563: Upgrade to docker-compose v2 format
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/aa3a5e232ac8f2bc2f2cc6dc0e27284aeb406e8d
bug 1218563: Add docker-build.sh for CKEditor

Tweak build.sh to work in shared volume in docker container

https://github.com/mozilla/kuma/commit/92f8277fe062c48b0c9f6681738efd4605ea9641
Merge pull request #3989 from jgmize/docker-build-ckeditor

bug 1218563: Add docker-build.sh for CKEditor
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/e65b6f2a15375327a5def03bdad8261ea6a6fac8
[bug 1218563] Update localization doc for docker

https://github.com/mozilla/kuma/commit/cb93fa813aef38376f30fbfbb0a88a1f23a30ccc
Merge pull request #3990 from safwanrahman/doc

[bug 1218563] Update localization doc for docker
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/df1e1e4b467e811e6f98453ddb86370ad3199f62
bug 1218563: Document building/updating base img

https://github.com/mozilla/kuma/commit/48fb8f5a7801bc1d8ae24d76caa54d80e4b5947d
Merge pull request #3992 from jgmize/doc-build-base-latest

bug 1218563: Document building/updating base img
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/1dcab93088bb9d380a1393abb0c0e92287601e6f
bug 1218563: Update Celery docs for Docker

These docs appear to have been written when Celery was newly introduced
to Kuma, and developers ran services on their host machine. Re-wrote the
document to reflect the current usage, and to remove RabbitMQ
installation instructions.

https://github.com/mozilla/kuma/commit/024d19cc116df48bd0cfab70c2a6030990f022ce
Merge pull request #3994 from jwhitlock/docker_docs_celery_1218563

bug 1218563: Update Celery docs for Docker
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/6a15d26be6bf86865833229fbee554ca004b905f
bug 1218563: Update ElasticSearch docs

Not many changes needed for Docker, but refreshed the docs anyway:

* Development uses Elasticsearch 1.7, not 1.3
* Remove justification for moving from Google / MySQL search
* Remove value judgements from Admin vs shell methods

https://github.com/mozilla/kuma/commit/163c75da954660dd5f10df62dd4d109e4905467b
Merge pull request #3995 from jwhitlock/docker_docs_search_1218563

bug 1218563: Update ElasticSearch docs
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/230c289d5ff5608b730a2f5eaf0e9ca70a87b631
bug 1218563: remove deprecated docker tag -f

https://github.com/mozilla/kuma/commit/17e430e86c2cbca518f08945e29bb36ce8375cb7
Merge pull request #3996 from jgmize/rm-tag-f

bug 1218563: remove deprecated docker tag -f
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/272cb6d7e6e253c2dddff39f14e2f43b4dce67b2
bug 1218563: Compile locales in deploy image

https://github.com/mozilla/kuma/commit/fe05f53d6659dd23c720943dbf37f279e4eaca2d
Merge pull request #3998 from jwhitlock/deploy_locales_1218563

bug 1218563: Compile locales in deploy image
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/941a0054439c5a8ba87682dcef7d414867b1684e
bug 1218563: Update documentation doc for Docker

Re-write the documentation for updating the documentation to use Docker.
A virtualenv in the host machine is still the fastest way to generate
documentation, but a method is given for using Docker, which may more
practical in the future.

https://github.com/mozilla/kuma/commit/d901b09c788db66535f75a349a28abaf4ffa0820
bug 1218563: Add docs for Linux root owner issue

- Add a troubleshooting section for Linux file permissions.
- Modify the documentation one-liners for the $(id -u) trick.

https://github.com/mozilla/kuma/commit/13572971115f14d0ab2cb611ea657a0a42c49e74
Merge pull request #3991 from jwhitlock/docker_docs_doc_1218563

bug 1218563: Update documentation doc for Docker
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/3b986a9389af385528c02f2d256bde288121df99
bug 1218563: Switch Docker to default install doc

Move the Docker install documentation to the "default" slot, since that
URL is linked to in other places.

https://github.com/mozilla/kuma/commit/7a3aedd1ecbb2d33f4a81577ee4508b365508959
bug 1218563: Promote Docker, deprecate Vagrant

Reword docs to promote Docker usage as the standard, and Vagrant as the
deprecated environment.  Mark Vagrant, Intern, and Locust as deprecated,
and move to the end of the table of contents. Make other small changes
that stick out as I'm reviewing the docs.

https://github.com/mozilla/kuma/commit/3b5ce0a4c7c6f9214e33bdf551276c2a6a5a3313
Merge pull request #3999 from jwhitlock/docker_docs_qa_1218563

bug 1218563: Promote Docker as default development environment
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/681a1d10c3fa8d22a72d5309cffa5c0948295874
[Bug 1218563] Run test in Docker environment with Travis CI

https://github.com/mozilla/kuma/commit/01f34130e6cbca1b79b3c5fc633d9e6f752ac27f
Merge pull request #3977 from safwanrahman/travis

[Bug 1218563] Run test in Docker environment with Travis CI
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/342aa91f696519d0e0ae9a060e447cc70a7c16b1
bug 1218563: Add .dockerignore

Add a .dockerignore that includes:
- Everything in .gitignore
- Everything in kumascript/.gitignore
- .git folders and others not needed in containers

This reduces my build context from 2 GB to about 50 MB.

https://github.com/mozilla/kuma/commit/83f2767d72489ca35cb49633b1c8ce47c5ed5f6b
bug 1218563: Omit more files from Docker

These files are not required in Docker, but were copied from .gitignore.

https://github.com/mozilla/kuma/commit/6163339e9965167ada736fb4134684642f15ddd6
Merge pull request #4006 from jwhitlock/dockerignore_1218563

bug 1218563: Add .dockerignore

r=jgmize
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/61bf627a7a1bdd93054ff6c51c945be3dfdc29cb
[Bug 1218563] Update ihavepower command to take optional password

https://github.com/mozilla/kuma/commit/8cd4af3e57370fc482b357dc1599759a8615ebc7
Merge pull request #4000 from safwanrahman/management

[Bug 1218563] Update ihavepower command to take optional password
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/939c0e4a9caece53c9dd72c35260f58a71a49578
bug 1218563: Use COMPOSE_FILE env var for tox.ini

Use the COMPOSE_FILE environment variable so that the docker-compose
commands are less verbose.

https://github.com/mozilla/kuma/commit/4482ea34662baff3d926adaa083baed340362f18
bug 1218563: Run "tox -e docker" in own project

Make it easier to run "tox -e docker" tests locally, by using a
different project name,  so that container get names (kumatox_web_1,
kumatox_mysql_1, etc.) that are distinct from the standard development
names (kuma_web_1, kuma_mysql_1). Shut down the containers at the end of
tests, for local development

https://github.com/mozilla/kuma/commit/6d584caaf29ab4e021c84905bb4fc227ed19e711
bug 1218563: Build images, and start MySQL first

Add builds steps to stop warnings with "docker-compose up" builds an
image.  Start the mysql container while rebuilding the base image, since
it has a non-trivial startup time, eliminating the 60 second wait.

https://github.com/mozilla/kuma/commit/548fdbb7bf5a7ac76621e3f8c288d712c9daa07c
Merge pull request #4007 from jwhitlock/build_base_travis_1218563

bug 1218563: Improve TravisCI docker build and test

r=jgmize
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/29fdd8a6661554cefdab270eb947ab4aa25351aa
[Bug 1218563] run docker containers as non-root user

https://github.com/mozilla/kuma/commit/1714adfef11f893473bd123743cf17ed5afb9d7b
Merge pull request #3997 from safwanrahman/docker

[Bug 1218563] run docker containers as non-root user
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/f6ea625fdca3d6e190a3a6f82be6a3bae1ca75d0
bug 1218563: Tune MySQL for local development

Move settings from my.cnf and docker-compose.yml to /etc/mysql/conf.d/kuma.cnf, and add some
additional params to speed up test runs.

The big one is innodb_flush_log_at_trx_commit=0, which changes from
writing to disk with each commit to writing once per second.  This was a
24% speed boost on Docker for Mac, from 1047 seconds to 745.

https://github.com/mozilla/kuma/commit/695a93b2f84905c93a047bc72b777245d1a3b3eb
Merge pull request #4015 from jwhitlock/tune_mysql_1218563

bug 1218563: Tune MySQL for local development
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/36513b7bb8ff7515c2f78ee60be49d9e8d965905
bug 1218563: Make build-base in Jenkinsfile and chown kuma

Remove default deis deploy

https://github.com/mozilla/kuma/commit/9aee0af0afe745d1b30aafc51039bd3abdb1d1c1
Merge pull request #4054 from mozilla/make-build-jenkinsfile

bug 1218563: Make build-base in Jenkinsfile and chown kuma
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/065f9f06df3d81372194e8a7c792d0009a297eb0
bug 1218563: fix make compose-test

Switch to docker-compose format 2.1 (requires docker-compose 1.9+)
Map user to ${UID:-0} (default 0)
Update Jenkinsfile syntax to eliminate deprecation warnings

https://github.com/mozilla/kuma/commit/2cd96892fc2e3685c4843291aee78a2938ef1cb4
bug 1218563: Use docker-compose 1.9.0 in TravisCI

https://github.com/mozilla/kuma/commit/e498937eb0d903f934754bbf0ad05ade40a89485
Merge pull request #4055 from mozilla/fix-compose-test

bug 1218563: fix make compose-test
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/5f5fa690ce7d78a485e022181f8606df041fe8cf
bug 1218563: Add docs for resetting database

"docker-compose down" is less commands than "stop / rm".

When the database is corrupted, the named volume must be removed and
recreated. Add how-to instructions to the troubleshooting docs.

https://github.com/mozilla/kuma/commit/24d52ed6cf5359cfb8ceed4d8dab69bde7063b23
Merge pull request #4048 from jwhitlock/reset_db_1218563

bug 1218563: Add docs for resetting database
Commit pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/6030a4f93c4f616ccfce0aec3c995092bd4f88ee
bug 1218563: Default to www-data user (#4078)

On OSX, UID is unset, and the root is used by default. This causes the
worker container to fail, since C_FORCE_ROOT is no longer used.  Change
the default to UID 33, which is the www-data user, when UID is unset.

Comment 40

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/ec00bb685021015bbb3d8edcbdaee0e7a17b1216
bug 1218563: Update base image to latest

Current latest is v0.3.6, contains security fixes. This change will
follow the upstream changes to the base image.

https://github.com/mozilla/kuma/commit/359f55b8d23077307cf541e5b80f769af577e46f
Merge pull request #4107 from jwhitlock/base_v3_6_1218563

bug 1218563: Update base image to v3.6

Comment 41

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/60a6dc784b0ef2ca2534111a83d65d604e5307be
[Bug 1218563] Remove TransactionTestCase in order to make test faster

https://github.com/mozilla/kuma/commit/2bd4da2bd6b53e49df57338004fea59f2d3b9d19
Merge pull request #4136 from safwanrahman/fix-test

[Bug 1218563] Remove TransactionTestCase in order to make test faster

Comment 42

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/b697d7f62dc98426dfead177ef3ec5a2b935bc65
bug 1218563: Cretae Deis-specific .env file

https://github.com/mozilla/kuma/commit/b38e5dc0bad5eedc54e9a9b34e37a3fc94f59f37
bug 1218563: Add .env-dist.dev for development

https://github.com/mozilla/kuma/commit/c356f04e1e61c09a59842755c2e72689f7ac8aee
Merge pull request #4130 from mozilla/env_1218563

bug 1218563: Update install docs for Linux, .env-dist.dev, and the sample DB

r=metadave
See Also: → bug 1352232

Comment 43

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/de43895d47e9e7824cf1d94663fd2967718a7786
bug 1218563: Use docker-compose for make bash, etc

Use docker-compose so that "make bash" and "make shell_plus" will work
even when your source directory is not named kuma.

https://github.com/mozilla/kuma/commit/2c039e8c7497cccfda38f331e67c77a1f1705fe2
Merge pull request #4201 from mozilla/make_bash_1218563

bug 1218563: Use docker-compose for make bash, etc

Comment 44

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/e617b8b71832e99304681bf38f1020415a07faca
bug 1218563: "make clean" for Py3, func tests

"make clean" will clean out more Python 2 compiled files, as well as
Python 3 compiled folders.  It now looks in all folders, including the
functional tests under tests/

https://github.com/mozilla/kuma/commit/4d746d86170925aa73cf1ef1b782a2f15bce5f8d
bug 1218563: Refresh ignore lists

* Remove "unignore" patterns that don't actually match files
* Base .gitignore on GitHub's template for Python projects
* Start ignoring Python 3 compiled caches
* Ignore more files created by dev process, such as sample databases and
  functional test virtualenvs.
* Ignore files created by deployment process in SCL3
* Update .dockerignore to match .gitignore

https://github.com/mozilla/kuma/commit/ba9597ba1f2a80c34d0bb0efbb6de75fd9c92d88
bug 1218563: use -delete, not rm -rf

https://github.com/mozilla/kuma/commit/a17989202fdb7fa5c39ce50672fd9d5553b22346
Merge pull request #4202 from mozilla/clean-ignore-1218563

Bug 1218563: Update "make clean", git and docker ignore lists

Comment 45

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/42a9c2038414f21242560301c01f1be9b52b1ea1
Bug 1218563: Only ignore /static/ in root

https://github.com/mozilla/kuma/commit/b47b003dac2231fe473cf5f59f0665db756d5170
Merge pull request #4212 from mozilla/1218563-git-ignore-static

Bug 1218563: Only ignore /static/ in root

Comment 46

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/8faa11c27158c41d410113dd34203763396c376d
bug 1218563: Omit built static, others in Docker

.dockerignore has a different syntax than .gitignore. Removed some
additional files from the Docker build context:

* /static - Build static files, rebuilt on image creation, ~100MB
* Python compiled files, size varies
* Locale machine object (.mo) files, rebuilt, 3 MB
* KumaScript, not needed in Kuma, 3 MB

Context drops from 150 MB to 44 MB for me.

https://github.com/mozilla/kuma/commit/afb14500d01a8c2b6beb0fc81d0766e1d29c72e3
Merge pull request #4226 from jwhitlock/dockerignore-static-1218563

bug 1218563: Omit built static, others in Docker

Comment 47

2 years ago
Commit pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/d8edc9ec3be949e5d5d67e5238b066172466c7fe
bug 1218563: Remove logs folder

This is not used in the current Docker config

Comment 48

2 years ago
Commit pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/f312d458be0832f59083b579346019fa24c147c4
bug 1218563: Adjust ignore files

Add notes about how to match directories in the root folder or anywhere
in the repo.

Change root folder matching in .gitingore, since some folder like build/
were being ignored anywhere in the project, not just at the top level.

Give up on the dream of copying .gitignore directly into
.dockerignore, since they are quite different.

Comment 49

2 years ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/5c4093964e195b2b277c2e8aa439c4f9187c3e93
bug 1218563: Remove unused supervisor config

Rather than running under supervisor, Docker images are running commands
(celery, gunicorn) directly.

https://github.com/mozilla/kuma/commit/107acffb58535e6cce459db6fdacfaed6dd94675
bug 1218563: Move kuma_base to docker/images

Move the Dockerfile and mini-docs for the kuma_base image to the
docker/images folder.

https://github.com/mozilla/kuma/commit/3b97edc6fedd636d009dbe43c7d24cceb1a270b4
bug 1218563: Move kuma to docker/images

Move the Dockerfile and mini-docs for the kuma image to the
docker/images folder.

https://github.com/mozilla/kuma/commit/7b2bf42381de3534ca20928318252f8f8d4a476e
bug 1218563: integration-tests to docker/images

Move DockerfileIntegrationTests and mini-docs to docker/images, and
update the pipeline config files for the new location.

https://github.com/mozilla/kuma/commit/41171301ee283c5cb66481145b8689bf4305d959
bug 1218563: Add docker image docs

https://github.com/mozilla/kuma/commit/cdb34a1f48616aef388c107af74e05ccf3207007
bug 1218563: Define new kumascript Docker image

Define a kumascript image and mini-docs that builds the kumascript
images in the context of kuma and its locale files.

https://github.com/mozilla/kuma/commit/5835fb025ffb0eee7933234cc92cf2297e4456a0
Merge pull request #4354 from jwhitlock/docker-shuffle-1218563

bug 1218563: Move Docker image definitions, add docs
We've moved MDN to AWS, running the various MDN services in Docker containers. There are remaining issues, but I think we can call the project complete. Thanks for getting this started, Rob!
Status: NEW → RESOLVED
Last Resolved: a year ago
Resolution: --- → FIXED

Comment 51

a year ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/dbe87e515c110c6dc2ae1e280fad780163c049b0
bug 1218563: Remove nginx

nginx is not used in development or production.

https://github.com/mozilla/kuma/commit/21a0da1e56fdac23e6857aa2b94a0a2ac46e4587
Merge pull request #4509 from jwhitlock/remove-nginx

bug 1218563: Remove nginx

Comment 52

6 months ago
Commits pushed to master at https://github.com/mozilla/kuma

https://github.com/mozilla/kuma/commit/747c05244ab9c81aed7d2a50471f5b789665ebf8
bug 1218563: Add SSL development configuration

Add an optional docker-compose override for SSL:

- Generate a self-signed cert for developer.127.0.0.1.nip.io and
  demos.developer.127.0.1.nip.io on startup. nip.io removes the
  need to update /etc/hosts
- Add an nginx service that uses the cert
- Configure web and other services to expect SSL

https://github.com/mozilla/kuma/commit/ca549459478b7bc68d6287e57602f6b9f5937a2f
Merge pull request #4950 from jwhitlock/ssl-1218563

bug 1218563: Add SSL development configuration
You need to log in before you can comment on or make changes to this bug.