php tag fixes

2024-12-24 13:45:32 +03:00 · 2024-12-10 16:03:44 +03:00 · 2024-12-10 16:03:44 +03:00 · 646d3ee048
commit 646d3ee048
parent 26a731eec1
26 changed files with 44 additions and 44 deletions
--- a/.github/workflows/_disabled/docker-linux-develop.yml.txt
+++ b/.github/workflows/_disabled/docker-linux-develop.yml.txt
@ -172,16 +172,16 @@ jobs:
      run: docker system prune --all --force --volumes

    - name: PHP (latest)
-      run:  docker build --compress -t epicmorg/php:latest linux/php/latest
+      run:  docker build --compress -t epicmorg/debian:bookworm-latest linux/php/latest

    - name: PHP 7.4
-      run:  docker build --compress -t epicmorg/php:php7.4 linux/php/php7.4
+      run:  docker build --compress -t epicmorg/debian:bookworm-php7.4 linux/php/php7.4

    - name: PHP 7.3
-      run:  docker build --compress -t epicmorg/php:php7.3 linux/php/php7.3
+      run:  docker build --compress -t epicmorg/debian:bookworm-php7.3 linux/php/php7.3

    - name: PHP 7.2
-      run:  docker build --compress -t epicmorg/php:php7.2 linux/php/php7.2
+      run:  docker build --compress -t epicmorg/debian:bookworm-php7.2 linux/php/php7.2

    - name: Cleanup
      run: docker system prune --all --force --volumes
--- a/.github/workflows/_disabled/docker-linux-master.yml.txt
+++ b/.github/workflows/_disabled/docker-linux-master.yml.txt
@ -219,9 +219,9 @@ jobs:
 ##################################################################################

    - name: PHP (latest)
-      run:  docker build --compress -t epicmorg/php:latest linux/php/latest
+      run:  docker build --compress -t epicmorg/debian:bookworm-latest linux/php/latest
    - name: Push PHP (latest)
-      run:  docker push epicmorg/php:latest
+      run:  docker push epicmorg/debian:bookworm-latest

    - name: Build Apache (latest)
      run:  docker build --compress -t epicmorg/apache2:latest linux/apache2/latest
@ -322,19 +322,19 @@ jobs:
             docker push epicmorg/balancer:rtmp-hls

    - name: PHP 7.4
-      run:  docker build --compress -t epicmorg/php:php7.4 linux/php/php7.4
+      run:  docker build --compress -t epicmorg/debian:bookworm-php7.4 linux/php/php7.4
    - name: Push PHP 7.4
-      run:  docker push epicmorg/php:php7.4
+      run:  docker push epicmorg/debian:bookworm-php7.4

    - name: PHP 7.3
-      run:  docker build --compress -t epicmorg/php:php7.3 linux/php/php7.3
+      run:  docker build --compress -t epicmorg/debian:bookworm-php7.3 linux/php/php7.3
    - name: Push PHP 7.3
-      run:  docker push epicmorg/php:php7.3
+      run:  docker push epicmorg/debian:bookworm-php7.3

    - name: PHP 7.2
-      run:  docker build --compress -t epicmorg/php:php7.2 linux/php/php7.2
+      run:  docker build --compress -t epicmorg/debian:bookworm-php7.2 linux/php/php7.2
    - name: Push PHP 7.2
-      run:  docker push epicmorg/php:php7.2
+      run:  docker push epicmorg/debian:bookworm-php7.2

    - name: Cleanup
      run: docker system prune --all --force --volumes
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php70
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php70
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.0
+FROM epicmorg/debian:bookworm-php7.0
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php71
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php71
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.1
+FROM epicmorg/debian:bookworm-php7.1
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php72
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php72
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.2
+FROM epicmorg/debian:bookworm-php7.2
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php73
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php73
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.3
+FROM epicmorg/debian:bookworm-php7.3
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php74
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php74
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.4
+FROM epicmorg/debian:bookworm-php7.4
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php80
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php80
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.0
+FROM epicmorg/debian:bookworm-php8.0
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php81
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php81
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.2
+FROM epicmorg/debian:bookworm-php8.2
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php82
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php82
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.2
+FROM epicmorg/debian:bookworm-php8.2
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php83
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/Dockerfile.php83
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.3
+FROM epicmorg/debian:bookworm-php8.3
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/lts/docker-compose.yml
@ -10,47 +10,47 @@ services:
      context: .
      dockerfile: ./Dockerfile.develop
  app-nodejs-php70:
-    image: "epicmorg/php:php7.0-nodejs"
+    image: "epicmorg/debian:bookworm-php7.0-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php70
  app-nodejs-php71:
-    image: "epicmorg/php:php7.1-nodejs"
+    image: "epicmorg/debian:bookworm-php7.1-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php71
  app-nodejs-php72:
-    image: "epicmorg/php:php7.2-nodejs"
+    image: "epicmorg/debian:bookworm-php7.2-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php72
  app-nodejs-php73:
-    image: "epicmorg/php:php7.3-nodejs"
+    image: "epicmorg/debian:bookworm-php7.3-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php73
  app-nodejs-php74:
-    image: "epicmorg/php:php7.4-nodejs"
+    image: "epicmorg/debian:bookworm-php7.4-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php74
  app-nodejs-php80:
-    image: "epicmorg/php:php8.0-nodejs"
+    image: "epicmorg/debian:bookworm-php8.0-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php80
  app-nodejs-php81:
-    image: "epicmorg/php:php8.1-nodejs"
+    image: "epicmorg/debian:bookworm-php8.1-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php81
  app-nodejs-php82:
-    image: "epicmorg/php:php8.2-nodejs"
+    image: "epicmorg/debian:bookworm-php8.2-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php82
  app-nodejs-php83:
-    image: "epicmorg/php:php8.3-nodejs"
+    image: "epicmorg/debian:bookworm-php8.3-nodejs"
    build:
      context: .
      dockerfile: ./Dockerfile.php83
--- a/linux/ecosystem/gitlab/runner/php7.2/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php7.2/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.2
+FROM epicmorg/debian:bookworm-php7.2
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/gitlab/runner/php7.3/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php7.3/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.3
+FROM epicmorg/debian:bookworm-php7.3
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/gitlab/runner/php7.4/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php7.4/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.4
+FROM epicmorg/debian:bookworm-php7.4
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/gitlab/runner/php8.0/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php8.0/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.0
+FROM epicmorg/debian:bookworm-php8.0
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/gitlab/runner/php8.1/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php8.1/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.1
+FROM epicmorg/debian:bookworm-php8.1
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/gitlab/runner/php8.2/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php8.2/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.2
+FROM epicmorg/debian:bookworm-php8.2
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/gitlab/runner/php8.3/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php8.3/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.3
+FROM epicmorg/debian:bookworm-php8.3
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/teamcity/agent/php7.2/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/php7.2/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.2
+FROM epicmorg/debian:bookworm-php7.2
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/teamcity/agent/php7.3/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/php7.3/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.3
+FROM epicmorg/debian:bookworm-php7.3
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/teamcity/agent/php7.4/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/php7.4/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php7.4
+FROM epicmorg/debian:bookworm-php7.4
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/teamcity/agent/php8.0/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/php8.0/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.0
+FROM epicmorg/debian:bookworm-php8.0
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/teamcity/agent/php8.1/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/php8.1/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.1
+FROM epicmorg/debian:bookworm-php8.1
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/teamcity/agent/php8.2/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/php8.2/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.2
+FROM epicmorg/debian:bookworm-php8.2
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/linux/ecosystem/teamcity/agent/php8.3/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/php8.3/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/php:php8.3
+FROM epicmorg/debian:bookworm-php8.3
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive