[whimsy] branch master updated: docker-compose is deprecated

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new f5eb4d3b docker-compose is deprecated
f5eb4d3b is described below

commit f5eb4d3b73c28b9416ad8e0e808f15bd89c5c43a
Author: Sebb <s...@apache.org>
AuthorDate: Fri Oct 6 14:14:52 2023 +0100

    docker-compose is deprecated
---
 Rakefile          | 8 ++++----
 config/setupmymac | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Rakefile b/Rakefile
index 23dc67a8..7a3a2af8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -454,11 +454,11 @@ end
 # Docker support
 namespace :docker do
   task :build do
-    sh 'docker-compose build web' # name 'web' must agree with services entry 
in docker-compose.yaml
+    sh 'docker compose build web' # name 'web' must agree with services entry 
in docker-compose.yaml
   end
 
   task :update => :build do
-    sh 'docker-compose run  --entrypoint ' +
+    sh 'docker compose run  --entrypoint ' +
       %('bash -c "rake update"') +
       ' web'
   end
@@ -466,11 +466,11 @@ namespace :docker do
   task :up do
     ldap_init # create LDAP config data files
     # Start the container which then runs 'rake docker:entrypoint'
-    sh 'docker-compose up'
+    sh 'docker compose up'
   end
 
   task :exec do
-    sh 'docker-compose exec web /bin/bash'
+    sh 'docker compose exec web /bin/bash'
   end
 
   # cannot depend on :config
diff --git a/config/setupmymac b/config/setupmymac
index 9466a6b0..560adae8 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -321,7 +321,7 @@ end
 
 if force[:prune]
   Dir.chdir 'docker' do
-    `docker-compose ps -q`.lines.each do |line|
+    `docker compose ps -q`.lines.each do |line|
       run 'docker', 'stop', line.chomp
     end
   end