cleanup deprecations and legacy

Author: Hans Höchtl

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 WebDevOps
+Copyright (c) 2015-2023 WebDevOps
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

CHANGELOG.md

@@ -66,6 +66,3 @@ documentation:
 		-e "VIRTUAL_PORT=8000" \
 		webdevops/sphinx sphinx-autobuild \
 		--poll -H 0.0.0.0 /opt/docs html
-
-webdevops/%:
-	python2 ./bin/console docker:build --threads=auto --whitelist=$@

LICENSE

@@ -1,48 +1,65 @@
 # Introduction
 
+We provide images which extend the official [PHP-Images](https://hub.docker.com/_/php/tags).
+We add additional stuff like:
+
+* almost any PHP module preinstalled
+* configuration based on ENV variables
+* run multiple services (like php-fpm and nginx) with supervisord
+
 [![GitHub issues](https://img.shields.io/github/issues/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/issues)[![GitHub forks](https://img.shields.io/github/forks/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/network)[![GitHub stars](https://img.shields.io/github/stars/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/stargazers)[![GitHub license](https://img.shields.io/github/license/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/blob/master/LICENSE)
-[![pipeline status](https://gitlab.com/webdevops/autobuild/badges/master/pipeline.svg)](https://gitlab.com/webdevops/autobuild/commits/master)
+[![pipeline status](https://gitlab.com/webdevops/dockerfile/badges/master/pipeline.svg)](https://gitlab.com/webdevops/dockerfile/commits/master)
+
 
-![Dockerfile](https://static.webdevops.io/dockerfile.svg)
 
-Automated build and test running on [WebDevOps CI](https://gitlab.com/webdevops/autobuild/) \(GitLab.com CI custom AWS runner\) sponsored by [Onedrop GmbH & Co. KG](https://1drop.de).
+Automated build and test running on [Gitlab CI](https://gitlab.com/webdevops/dockerfile/) \(GitLab.com CI custom Google Cloud runner\) sponsored by [Onedrop GmbH & Co. KG](https://1drop.de).
 
 [![Docker layout](documentation/gitbook/.gitbook/assets/docker-image-layout.gv.png)](https://github.com/webdevops/Dockerfile/tree/511a870fa90fe53da5c63a95b4254f6980e6d3d2/documentation/docs/resources/images/docker-image-layout.gv.png)
 
 ## Communication and support
 
-Join us on [Slack](https://webdevops.io/slack/)
-
 Or write an issue in our [GitHub repository](https://github.com/webdevops/Dockerfile/issues).
 
-## Documentation
+## Build process
 
-* [Old version of the documentation is available on readthedocs](https://dockerfile.readthedocs.io/)
-* [New version is currently being written on gitbook](https://webdevops.gitbook.io/dockerfile)
+### File generation
+
+The general build process is currently a mixture of python jinja2 legacy and PHP.
+
+First we build the files inside the `docker` directory using this command:
+
+```
+docker run --rm -ti -v $PWD:/app -w /app webdevops/dockerfile-build-env make provision
+``` 
 
-## Deprecations
+It will use the Jinja2 templates inside of the `template` directory and the 
+config files from the `provisioning` directory.
 
-### Debian/Ubuntu PHP
+**The files in the `docker` directory are never modified manually**
 
-The following images are DEPRECATED and not longer built automatically:
+*This will be replaced with PHP twig templates in the future to streamline everything.*
+### Building in CI
 
-* `webdevops/php:ubuntu-*`
-* `webdevops/php:debian-*`
-* `webdevops/php-dev:ubuntu-*`
-* `webdevops/php-dev:debian-*`
-* `webdevops/php-apache:ubuntu-*`
-* `webdevops/php-apache:debian-*`
-* `webdevops/php-apache-dev:ubuntu-*`
-* `webdevops/php-apache-dev:debian-*`
-* `webdevops/php-nginx:ubuntu-*`
-* `webdevops/php-nginx:debian-*`
-* `webdevops/php-nginx-dev:ubuntu-*`
-* `webdevops/php-nginx-dev:debian-*`
+We generate a multi stage Gitlab-CI configuration using PHP:
 
-Also only supported PHP versions are built automatically.
+```
+docker run --rm -ti -v $PWD:/app -w /app/ci webdevops/php:8.1 composer install
+docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.1 ci/console gitlab:generate
+```
 
-You shall use the new images which are based on the official `php:(7|8).(0|1|2|3|4)-fpm` images.
-The official PHP images are based on debian.
+Gitlab CI builds every image independant and runs serverspec and structure tests on every
+image before pushing them to the registry.
+
+## Documentation
+
+As in many projects the documentation is kind of up to date 😅.
+
+* [Old version of the documentation is available on readthedocs](https://dockerfile.readthedocs.io/)
+* [New version is currently being written on gitbook](https://webdevops.gitbook.io/dockerfile)
+
+### Debian PHP
+
+The following images which are currently supported are based on `php:{VER}-fpm-buster`.
 
 * `webdevops/php:7.4`
 * `webdevops/php:8.0`
@@ -72,28 +89,7 @@ The official PHP images are based on debian.
 
 ### Alpine PHP
 
-The following images are DEPRECATED and not longer built automatically:
-
-* `webdevops/php:alpine`
-* `webdevops/php:alpine-3`
-* `webdevops/php:alpine-3-php7`
-* `webdevops/php-dev:alpine`
-* `webdevops/php-dev:alpine-3`
-* `webdevops/php-dev:alpine-3-php7`
-* `webdevops/php-apache:alpine`
-* `webdevops/php-apache:alpine-3`
-* `webdevops/php-apache:alpine-3-php7`
-* `webdevops/php-apache-dev:alpine`
-* `webdevops/php-apache-dev:alpine-3`
-* `webdevops/php-apache-dev:alpine-3-php7`
-* `webdevops/php-nginx:alpine`
-* `webdevops/php-nginx:alpine-3`
-* `webdevops/php-nginx:alpine-3-php7`
-* `webdevops/php-nginx-dev:alpine`
-* `webdevops/php-nginx-dev:alpine-3`
-* `webdevops/php-nginx-dev:alpine-3-php7`
-
-You shall use the new images which are based on the official `php:7.(1|2|3|4)-fpm-alpine` images.
+The following images which are currently supported are based on `php:{VER}-fpm-alpine`.
 
 * `webdevops/php:7.4-alpine`
 * `webdevops/php:8.0-alpine`
@@ -119,5 +115,3 @@ You shall use the new images which are based on the official `php:7.(1|2|3|4)-fp
 * `webdevops/php-nginx-dev:8.0-alpine`
 * `webdevops/php-nginx-dev:8.1-alpine`
 * `webdevops/php-nginx-dev:8.2-alpine`
-
-*We left out 7.0 because it would vary too much from the current versions*