update documentation

webdevops · Apr 13, 2020 · 08649b9 · 08649b9
1 parent a7ea75b
commit 08649b9
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 24 deletions.
diff --git a/documentation/docs/content/DockerImages/dockerfiles/ansible.rst b/documentation/docs/content/DockerImages/dockerfiles/ansible.rst
@@ -2,6 +2,8 @@
 webdevops/ansible
 =================
 
+*deprecated*
+
 All ``webdevops/ansible`` images are based on ``webvdevops/bootstrap`` without any changes.
 
 Docker image tags

diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst
@@ -2,6 +2,8 @@
 webdevops/hhvm-apache
 =====================
 
+*deprecated*
+
 These image extends ``webdevops/hhvm`` with a apache daemon which is running on port 80 and 443
 
 .. include:: include/general-supervisor.rst

diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst
@@ -2,6 +2,8 @@
 webdevops/hhvm-nginx
 ====================
 
+*deprecated*
+
 These image extends ``webdevops/hhvm`` with a nginx daemon which is running on port 80 and 443
 
 .. include:: include/general-supervisor.rst

diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst
@@ -2,6 +2,8 @@
 webdevops/hhvm
 ==============
 
+*deprecated*
+
 The hhvm images are based on ``webdevops/base-app`` with HHVM cli and HHVM daemon. HHVM daemon is running on port 9000.
 
 .. include:: include/general-supervisor.rst

diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst
@@ -1,15 +1,15 @@
 ====================== ==========================
 Tag                    Distribution name
 ====================== ==========================
-``alpine``             Alpine (rolling release)
+``alpine``             Alpine
 ``alpine-3``           *deprecated*
-``ubuntu-12.04``       precise
-``ubuntu-14.04``       trusty (LTS)
-``ubuntu-15.04``       vivid
-``ubuntu-15.10``       wily
-``ubuntu-16.04``       xenial (LTS)
-``debian-7``           wheezy
-``debian-8``           jessie
-``debian-9``           stretch
+``ubuntu-12.04``       *deprecated*
+``ubuntu-14.04``       *deprecated*
+``ubuntu-15.04``       *deprecated*
+``ubuntu-15.10``       *deprecated*
+``ubuntu-16.04``       *deprecated*
+``debian-7``           *deprecated*
+``debian-8``           *deprecated*
+``debian-9``           *deprecated*
 ``centos-7``
 ====================== ==========================
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-hhvm.rst
@@ -1,6 +1,6 @@
 ====================== ==========================
 Tag                    Distribution name
 ====================== ==========================
-``ubuntu-14.04``       trusty (LTS)
-``ubuntu-16.04``       xenial (LTS)
+``ubuntu-14.04``       *deprecated*
+``ubuntu-16.04``       *deprecated*
 ====================== ==========================
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst
@@ -6,21 +6,26 @@ Tag                    Distribution name                   PHP Version
 ``7.1``                *customized official php image*     PHP 7.1
 ``7.2``                *customized official php image*     PHP 7.2
 ``7.3``                *customized official php image*     PHP 7.3
-``7.4``                *customized official php image*     PHP 7.4 (RC)
-``alpine``             *link to alpine-php7*               PHP 7.x
-``alpine-php7``                                            PHP 7.x
-``alpine-php5``                                            PHP 5.6
+``7.4``                *customized official php image*     PHP 7.4
+``7.1-alpine``         *customized official php image*     PHP 7.1
+``7.2-alpine``         *customized official php image*     PHP 7.2
+``7.3-alpine``         *customized official php image*     PHP 7.3
+``7.4-alpine``         *customized official php image*     PHP 7.4
+``alpine``             *deprecated*                        PHP 7.x
+``alpine-php7``        *deprecated*                        PHP 7.x
+``alpine-php5``        *deprecated*                        PHP 5.6
 ``alpine-3``           *deprecated*                        PHP 5.6
 ``alpine-3-php7``      *deprecated*                        PHP 7.x
-``ubuntu-12.04``       precise                             PHP 5.3
-``ubuntu-14.04``       trusty (LTS)                        PHP 5.5
-``ubuntu-15.04``       vivid                               PHP 5.6
-``ubuntu-15.10``       wily                                PHP 5.6
-``ubuntu-16.04``       xenial (LTS)                        PHP 7.0
-``debian-7``           wheezy                              PHP 5.4
-``debian-8``           jessie                              PHP 5.6
-``debian-8-php7``      jessie with dotdeb                  PHP 7.x (via sury)
-``debian-9``           stretch                             PHP 7.0
+``ubuntu-12.04``       *deprecated*                        PHP 5.3
+``ubuntu-14.04``       *deprecated*                        PHP 5.5
+``ubuntu-15.04``       *deprecated*                        PHP 5.6
+``ubuntu-15.10``       *deprecated*                        PHP 5.6
+``ubuntu-16.04``       *deprecated*                        PHP 7.0
+``debian-7``           *deprecated*                        PHP 5.4
+``debian-8``           *deprecated*                        PHP 5.6
+``debian-8-php7``      *deprecated*                        PHP 7.x (via sury)
+``debian-9``           *deprecated*                        PHP 7.0
 ``centos-7``                                               PHP 5.4
 ``centos-7-php56``                                         PHP 5.6
+``centos-7-php7``                                          PHP 7.0
 ====================== =================================== ===============
diff --git a/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst b/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst
@@ -2,6 +2,8 @@
 webdevops/samson-deployment
 ===========================
 
+*deprecated*
+
 These image extends ``zendesk/samson`` and is a webbased deployment service with Ansistrano_, Capistrano_ and
 PHP Deployer_.
 

diff --git a/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst b/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst
@@ -2,6 +2,8 @@
 webdevops/sphinx
 ================
 
+*deprecated*
+
 These image extends ``webdevops/bootstrap`` and provides a sphinx build system.
 
 Docker image tags

diff --git a/documentation/docs/content/DockerImages/dockerfiles/typo3-solr.rst b/documentation/docs/content/DockerImages/dockerfiles/typo3-solr.rst
@@ -2,6 +2,8 @@
 webdevops/typo3-solr
 ====================
 
+*deprecated*
+
 These image extends ``solr`` and provides a prebuild image for TYPO3 solr service.
 
 Docker image tags