Skip to content

Switch to Compose V2 #5

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 28, 2024
Merged

Switch to Compose V2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e9e88d
Use compose v2 syntax
jnk0 Apr 28, 2024
e9918dc
Update dependency on puppetlabs-docker
jnk0 Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
{
"name": "puppetlabs/docker",
"version_requirement": ">= 3.13.1 < 5.0"
"version_requirement": ">= 10.0.0 < 11.0.0"
},
{
"name": "puppet/systemd",
Expand Down
5 changes: 2 additions & 3 deletions templates/jitsi.service.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ User=root
Type=oneshot
RemainAfterExit=true
WorkingDirectory=/srv/jitsi
ExecStart=/usr/local/bin/docker-compose -f docker-compose.yml<% if @compose_jigasi == true -%>
ExecStart=/usr/bin/docker compose -f docker-compose.yml<% if @compose_jigasi == true -%>
-f jigasi.yml <% end %><% if @compose_jibri == true -%>
-f jibri.yml <% end %><% if @compose_etherpad == true -%>
-f etherpad.yml <% end -%>
up -d --remove-orphans
ExecStop=/usr/local/bin/docker-compose down
ExecStop=/usr/bin/docker compose down

[Install]
WantedBy=multi-user.target