Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Merge the Complement testing Docker images into a single, multi-purpose image. #12881

Merged
merged 28 commits into from
Jun 8, 2022
Merged

Merge the Complement testing Docker images into a single, multi-purpose image. #12881

merged 28 commits into from
Jun 8, 2022

Commits on May 24, 2022

  1. Mutiny: oust the monolith image and replace with the workers image

    @reivilibre
    reivilibre committed May 24, 2022
    Configuration menu
    Copy the full SHA
    e4137c1 View commit details
    Browse the repository at this point in the history

  2. Update references in Dockerfile

    @reivilibre
    reivilibre committed May 24, 2022
    Configuration menu
    Copy the full SHA
    865fa26 View commit details
    Browse the repository at this point in the history

  3. Update complement.sh to use the unified image

    @reivilibre
    reivilibre committed May 24, 2022
    Configuration menu
    Copy the full SHA
    edc7fcd View commit details
    Browse the repository at this point in the history

Commits on May 26, 2022

  1. Make it possible to disable Redis with an env var

    @reivilibre
    reivilibre committed May 26, 2022
    Configuration menu
    Copy the full SHA
    15215bd View commit details
    Browse the repository at this point in the history

  2. Require START_POSTGRES=1 to start Postgres

    @reivilibre
    reivilibre committed May 26, 2022
    Configuration menu
    Copy the full SHA
    97699e3 View commit details
    Browse the repository at this point in the history

  3. Make the Complement Synapse launcher able to handle all 3 scenarios

    @reivilibre
    reivilibre committed May 26, 2022
    Configuration menu
    Copy the full SHA
    9cd96d2 View commit details
    Browse the repository at this point in the history

  4. Don't enable Redis for the monolith case 

    (It causes test errors!)
    @reivilibre
    reivilibre committed May 26, 2022
    Configuration menu
    Copy the full SHA
    3a588a0 View commit details
    Browse the repository at this point in the history

  5. Burn env vars into the image (sad and hopefully temporary)

    @reivilibre
    reivilibre committed May 26, 2022
    Configuration menu
    Copy the full SHA
    7bc03a6 View commit details
    Browse the repository at this point in the history

  6. Newsfile 

    Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
    @reivilibre
    reivilibre committed May 26, 2022
    Configuration menu
    Copy the full SHA
    bf37bf3 View commit details
    Browse the repository at this point in the history

  7. Bring back the experimental features

    @reivilibre
    reivilibre committed May 26, 2022
    Configuration menu
    Copy the full SHA
    facccd0 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2022

  1. Apply suggestions from Rich

    @reivilibre
    reivilibre committed May 30, 2022
    Configuration menu
    Copy the full SHA
    7e9884a View commit details
    Browse the repository at this point in the history

  2. Remove mention of 'worker' from entrypoint 

    But still retain the word 'Complement' so we know it's Complement-specific
    @reivilibre
    reivilibre committed May 30, 2022
    Configuration menu
    Copy the full SHA
    423e212 View commit details
    Browse the repository at this point in the history

  3. Pass the environment variables straight through, with no burning!

    @reivilibre
    reivilibre committed May 30, 2022
    Configuration menu
    Copy the full SHA
    470fabe View commit details
    Browse the repository at this point in the history

  4. Add back SYNAPSE_VERSION build arguments

    @reivilibre
    reivilibre committed May 30, 2022
    Configuration menu
    Copy the full SHA
    b0241e7 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. Automatically disable Redis only for no-worker instances

    @reivilibre
    reivilibre committed May 31, 2022
    Configuration menu
    Copy the full SHA
    3537762 View commit details
    Browse the repository at this point in the history

  2. Improve Complement documentation about 'Stuff' :)

    @reivilibre
    reivilibre committed May 31, 2022
    Configuration menu
    Copy the full SHA
    8ae3da7 View commit details
    Browse the repository at this point in the history

  3. Update the contributing guide

    @reivilibre
    reivilibre committed May 31, 2022
    Configuration menu
    Copy the full SHA
    33aeb67 View commit details
    Browse the repository at this point in the history

  4. Update README-testing.md

    @reivilibre
    reivilibre committed May 31, 2022
    Configuration menu
    Copy the full SHA
    9f8d317 View commit details
    Browse the repository at this point in the history

  5. Fix sentence that dropped off

    @reivilibre
    reivilibre committed May 31, 2022
    Configuration menu
    Copy the full SHA
    9531da6 View commit details
    Browse the repository at this point in the history

  6. Update docker/README-testing.md 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @reivilibre @richvdh
    reivilibre and richvdh committed May 31, 2022
    Configuration menu
    Copy the full SHA
    2beae8f View commit details
    Browse the repository at this point in the history

  7. Apply suggestions from code review 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @reivilibre @richvdh
    reivilibre and richvdh committed May 31, 2022
    Configuration menu
    Copy the full SHA
    bc5d529 View commit details
    Browse the repository at this point in the history

  8. Remove obsolete START_REDIS

    @reivilibre
    reivilibre committed May 31, 2022
    Configuration menu
    Copy the full SHA
    166b046 View commit details
    Browse the repository at this point in the history

  9. Fix comment explaining the overwritten config file

    @reivilibre
    reivilibre committed May 31, 2022
    Configuration menu
    Copy the full SHA
    4a739ca View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. Convert workers-shared.yaml to Jinja2 and import the original file ra… 

    …ther than appending the files
    @reivilibre
    reivilibre committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    1af38ef View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2022

  1. Add comment about how it fits in

    @reivilibre
    reivilibre committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    6daac8a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into rei/one_complement_image

    @reivilibre
    reivilibre committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    6c01955 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Update docker/configure_workers_and_start.py 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @reivilibre @richvdh
    reivilibre and richvdh committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    2fd415b View commit details
    Browse the repository at this point in the history

  2. Move comment to top of file and rephrase slightly

    @reivilibre
    reivilibre committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    b548132 View commit details
    Browse the repository at this point in the history