Merge branch 'release/3.0.0'

.github/workflows/publishDockerImage.yaml

@@ -10,6 +10,9 @@
 name: Publish Docker image to hub.docker.com
 
 on:
+  push:
+    branches:
+        - 'develop'
   release:
     types: [published]
 

ChangeLog

@@ -1,3 +1,4 @@
+2024-05-03         [RELEASE] Release of deploy-typo3-capistrano 3.0.0 (Dirk Wenzel)
 2022-09-14         [RELEASE] Release of deploy-typo3-capistrano 2.1.0 (Dirk Wenzel)
 2022-09-14 3eaf086 [CI] reset deployment rule for docker hub (Dirk Wenzel)
 2022-09-14 6df3ad6 [CI] test deployment to docker hub (Dirk Wenzel)

Dockerfile

@@ -1,9 +1,9 @@
-FROM ruby:2.3
+FROM ruby:2.7
 
 COPY Gemfile .
-COPY Gemfile.lock .
-COPY patches patches
 
-RUN gem install bundler -v '~>2' --no-document \
+RUN gem install bundler -v '~>1' --no-document \
     && bundle \
-    && patch /usr/local/bundle/gems/capistrano-3.11.2/lib/capistrano/dsl.rb patches/capistrano-dump-io.patch
+    && bundle lock --update \
+    && bundle config --global frozen 1 \
+    && bundle install

Gemfile

@@ -2,4 +2,5 @@
 
 source "https://rubygems.org"
 
-gem 'dkdeploy-typo3-cms', '~> 8.1'
+gem 'capistrano', '~> 3.17', '>= 3.17.3'
+gem 'dkdeploy-core', '~> 10.0'

Gemfile.lock

@@ -1,39 +1,41 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.4.0)
+    airbrussh (1.5.2)
       sshkit (>= 1.6.1, != 1.7.0)
-    capistrano (3.11.2)
+    base64 (0.2.0)
+    capistrano (3.18.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.10)
-    dkdeploy-core (9.2.4)
-      capistrano (~> 3.11.0)
-      highline (~> 1.7.1)
-    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.10.0)
+    concurrent-ruby (1.2.3)
+    dkdeploy-core (10.0.0)
+      capistrano (~> 3.16)
+      highline (~> 2.0.3)
+    highline (2.0.3)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
-    phpass-ruby (0.1.2)
-    rake (13.0.6)
-    sshkit (1.21.2)
+    mutex_m (0.2.0)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.2.3)
+    rake (13.2.1)
+    sshkit (1.22.2)
+      base64
+      mutex_m
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dkdeploy-typo3-cms (~> 8.1)
+  capistrano (~> 3.17, >= 3.17.3)
+  dkdeploy-core (~> 10.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

README.md

@@ -1,11 +1,11 @@
 # Deploy TYPO3 Capistrano
 
 > Docker image for deployment of TYPO3 CMS applications via Capistrano, based on
-> [`dkdeploy-typo3-cms`][4].
+> [`dkdeploy-core`][4].
 
 ## What does it do?
 
-This package provides a Docker image with preinstalled Capistrano for TYPO3.
+This package provides a Docker image with preinstalled Capistrano.
 It can be used for deployment of TYPO3 projects. See the [Gemfile](Gemfile)
 for all included packages.
 
@@ -35,10 +35,6 @@ The following image tags are available:
 | `<version>` | _tags, e.g. `1.0.1`_ |
 | `feature-*` | `feature/*`          |
 
-## Important notes
-
-The delivered version of Capistrano is patched to avoid random `can't dump IO`
-errors.
 
 ## Migration
 
@@ -54,4 +50,4 @@ errors.
 
 [1]: https://capistranorb.com/
 [3]: https://hub.docker.com/r/cpsit/deploy-typo3-capistrano
-[4]: https://github.com/dkdeploy/dkdeploy-typo3-cms
+[4]: https://github.com/dkdeploy/dkdeploy-core