Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge proprietary into open-source, June/July 2022 #13

Merged
merged 11 commits into from
Jul 11, 2022
Merged

Conversation

axisofentropy
Copy link
Member

No description provided.

@axisofentropy axisofentropy changed the title Merge 2022 07 Merge proprietary into open-source, June/July 2022 Jun 27, 2022
@axisofentropy axisofentropy changed the base branch from main to develop June 27, 2022 18:42
This was referenced Jun 28, 2022
Makefile Outdated

build_shell:
docker-compose build
docker compose build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think docker-compose build was correct

Makefile Outdated

up:
docker-compose up
docker compose up
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think docker-compose up was correct

Makefile Outdated

shell:
docker-compose run --service-ports --rm controller bash
docker compose run --service-ports --rm controller bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think docker-compose run --service-ports --rm controller bash was correct

Makefile Outdated
@@ -23,16 +23,16 @@ NO_COLOR='\033[0m'
clean_world: destroy_shell build_shell up

destroy_shell:
docker-compose down -v
docker compose down -v
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think docker-compose down -v was correct

@moklidia moklidia linked an issue Jul 11, 2022 that may be closed by this pull request
@moklidia moklidia merged commit 701992f into develop Jul 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Open-source controller updates
4 participants