Merge branch 'release/2.0.0'

CPS-IT · May 6, 2022 · 0b63179 · 0b63179
2 parents ec7351b + b54c578
commit 0b63179
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 22 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2022-05-06         [RELEASE] Release of deploy-typo3-capistrano 2.0.0 (Elias Häußler)
+2022-04-25 0d53df2 [DOCS] Add migration steps to README.md (Elias Häußler)
+2022-04-25 8a529c2 [TASK] Update to dkdeploy-typo3-cms 8.1.x (Elias Häußler)
+
 2022-04-25         [RELEASE] Release of deploy-typo3-capistrano 1.0.4 (Elias Häußler)
 2022-04-25 0886306 [DOCS] Mention replacement for legacy image on Docker Hub (Elias Häußler)
 2022-04-25 d95b311 [DOCS] Document available tags in README.md (Elias Häußler)

diff --git a/Dockerfile b/Dockerfile
@@ -6,4 +6,4 @@ COPY patches patches
 
 RUN gem install bundler -v '~>2' --no-document \
     && bundle \
-    && patch /usr/local/bundle/gems/capistrano-3.5.0/lib/capistrano/dsl.rb patches/capistrano-dump-io.patch
+    && patch /usr/local/bundle/gems/capistrano-3.11.2/lib/capistrano/dsl.rb patches/capistrano-dump-io.patch
diff --git a/Gemfile b/Gemfile
@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gem 'dkdeploy-typo3-cms', '~> 7.0'
+gem 'dkdeploy-typo3-cms', '~> 8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,42 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.3.1)
+    airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    capistrano (3.5.0)
+    capistrano (3.11.2)
       airbrussh (>= 1.0.0)
-      capistrano-harrow
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-harrow (0.5.3)
-    concurrent-ruby (1.1.3)
-    dkdeploy-core (8.0.1)
-      capistrano (~> 3.5.0)
+    concurrent-ruby (1.1.10)
+    dkdeploy-core (9.2.4)
+      capistrano (~> 3.11.0)
       highline (~> 1.7.1)
-      sshkit (= 1.10.0)
-    dkdeploy-php (7.0.0)
-      dkdeploy-core (~> 8.0)
-    dkdeploy-typo3-cms (7.0.0)
-      dkdeploy-php (~> 7.0)
+    dkdeploy-php (8.0.0)
+      dkdeploy-core (~> 9.0)
+    dkdeploy-typo3-cms (8.1.0)
+      dkdeploy-php (~> 8.0)
       phpass-ruby (~> 0.1)
     highline (1.7.10)
-    i18n (1.1.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
     phpass-ruby (0.1.2)
-    rake (12.3.1)
-    sshkit (1.10.0)
+    rake (13.0.6)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dkdeploy-typo3-cms (~> 7.0)
+  dkdeploy-typo3-cms (~> 8.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3
diff --git a/README.md b/README.md
@@ -43,6 +43,18 @@ The following image tags are available:
 The delivered version of Capistrano is patched to avoid random `can't dump IO`
 errors. See the corresponding [merge request][2] that introduced this patch.
 
+## Migration
+
+### 1.x → 2.x
+
+* SCM value `:copy` is deprecated in Capistrano.
+  - Remove config `set :scm, :copy` from your `deploy.rb` file. `dkdeploy-core`
+    already configures `:copy` as default value.
+* Release folder name pattern has changed.
+  - There's nothing to do. Capistrano will print a warning until all release
+    folders with the old name schema are removed. This happens automatically
+    during the `deploy:cleanup` task.
+
 [1]: https://gitlab.321.works/DevOps/templates/backend/deployment
 [2]: https://gitlab.321.works/DevOps/docker-images/deploy-typo3-capistrano/-/merge_requests/2
 [3]: https://hub.docker.com/r/cpsit/deploy-typo3-capistrano