-
Notifications
You must be signed in to change notification settings - Fork 422
Conversation
53a1c8e
to
dfb7318
Compare
@@ -57,6 +57,9 @@ jobs: | |||
brew install lima docker | |||
limactl start --name=default template://docker | |||
echo "DOCKER_HOST=unix:///Users/runner/.lima/default/sock/docker.sock" >> $GITHUB_ENV | |||
# install the docker compose plugin | |||
mkdir -p ~/.docker/cli-plugins |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is where the docker compose plugin is made discoverable
@@ -28,7 +28,7 @@ jobs: | |||
os: | |||
- ubuntu-20.04 # Ubuntu 20.04 "Focal Fossa" | |||
python-version: [ '3.8' ] | |||
services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue] | |||
services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue, analyticsapi+insights+lms] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add analytics and insights to provisioning tests
@@ -1,4 +1,4 @@ | |||
-c constraints.txt | |||
|
|||
docker-compose # For launching the devstack Docker containers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the PyPI docker-compose, which pinned PyYAML to a version that didn't work on Apple Silicon
@@ -48,7 +48,7 @@ jobs: | |||
sudo apt update | |||
sudo apt install docker-ce containerd.io | |||
docker version | |||
docker-compose --version | |||
docker compose --version |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[inform] this spaced version also works with podman
➜ docker compose --version
podman version 4.6.2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this looks good. Feel free to wait for Tim to test on Linux and verify that we don't need to do any soft linking shenanigans there.
For Linux, developers on Ubuntu (and Debian) should ensure they've uninstalled |
Optionally, we may also want to give a bit of advice somewhere in the docs on how to work with older versions of devstack that still use
|
Do we want to give advice for older devstack or just add to the solve-by-updating section of troubleshooting? |
I was actually thinking of mentioning it in the "Developing on Open edX named release branches" file, but it's probably worth mentioning on the troubleshooting page too, yeah. |
There's already a recommendation in there for keeping devstack on master. I worry adding stuff about workarounds for older devstacks will make things more confusing rather than less. I'm also not sure what exact bug you'd get if you didn't update devstack (to put in the troubleshooting guide). |
The docs I'm looking at say to check out the named-release branch of devstack rather than staying on master. That means that if someone wants to work on Palm, they check out |
Gotcha. Will update |
Replace docker-compose with docker compose in all instances. Docker-compose is no longer supported. For macs, this requires installing the docker compose plugin.
Also adds provisioning tests for analyticsapi and insights to the PR checks. Coursegraph needs its neo4j image updated before tests will pass so I left it out.
I've completed each of the following or determined they are not applicable: