(wip)

lucassabreu · lucassabreu · commit 432890d9e0e0 · 2025-11-16T15:59:16.000-03:00
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -128,7 +128,7 @@ jobs:
         with:
           images: lojassimonetti/php-apache-oci8-composer
           tags: |
-            type=raw,value=${{ inputs.name }}-{{ matrix.variation }},enable=true
+            type=raw,value=${{ inputs.name }}-${{ matrix.variation }},enable=true
 
       - name: Should push?
         id: shouldPush
diff --git a/Dockerfile.grpc b/Dockerfile.grpc
@@ -1,4 +1,5 @@
-FROM lojassimonetti/php-apache-oci8-composer:php8dot3
+ARG IMAGE_BASE
+FROM ${IMAGE_BASE}
 
 USER root
 
diff --git a/Dockerfile.mongodb b/Dockerfile.mongodb
@@ -1,4 +1,5 @@
-FROM lojassimonetti/php-apache-oci8-composer:php8dot3
+ARG IMAGE_BASE
+FROM ${IMAGE_BASE}
 
 USER root
 
diff --git a/Dockerfile.mongodb-1.21.0 b/Dockerfile.mongodb-1.21.0
@@ -1,4 +1,5 @@
-FROM lojassimonetti/php-apache-oci8-composer:php8dot3
+ARG IMAGE_BASE
+FROM ${IMAGE_BASE}
 
 USER root
 
diff --git a/Dockerfile.pgsql b/Dockerfile.pgsql
@@ -1,5 +1,4 @@
 ARG IMAGE_BASE
-
 FROM ${IMAGE_BASE}
 
 USER root
diff --git a/config.json b/config.json
@@ -13,7 +13,7 @@
   {
     "name": "php8dot0",
     "version": "8.0",
-    "base": "php:8.0-apache-bookworm",
+    "base": "php:8.0-apache",
     "xdebug_version": "3.2.1",
     "redis_version": "5.3.7",
     "imap_version": "",
@@ -52,7 +52,7 @@
     "imap_version": "",
     "imap_type": "php-ext",
     "php_erros_enabled": true,
-    "variations": []
+    "variations": ["grpc", "mongodb", "mongodb-1.21.0"]
   },
   {
     "name": "php8dot4",
@@ -63,6 +63,6 @@
     "imap_version": "",
     "imap_type": "pecl",
     "php_erros_enabled": true,
-    "variations": []
+    "variations": ["grpc", "mongodb"]
   }
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`ARG IMAGE_BASE`
`2`		`-`
`3`	`2`	`FROM ${IMAGE_BASE}`
`4`	`3`
`5`	`4`	`USER root`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`{`
`14`	`14`	`"name": "php8dot0",`
`15`	`15`	`"version": "8.0",`
`16`		`- "base": "php:8.0-apache-bookworm",`
	`16`	`+ "base": "php:8.0-apache",`
`17`	`17`	`"xdebug_version": "3.2.1",`
`18`	`18`	`"redis_version": "5.3.7",`
`19`	`19`	`"imap_version": "",`
`@@ -52,7 +52,7 @@`
`52`	`52`	`"imap_version": "",`
`53`	`53`	`"imap_type": "php-ext",`
`54`	`54`	`"php_erros_enabled": true,`
`55`		`- "variations": []`
	`55`	`+ "variations": ["grpc", "mongodb", "mongodb-1.21.0"]`
`56`	`56`	`},`
`57`	`57`	`{`
`58`	`58`	`"name": "php8dot4",`
`@@ -63,6 +63,6 @@`
`63`	`63`	`"imap_version": "",`
`64`	`64`	`"imap_type": "pecl",`
`65`	`65`	`"php_erros_enabled": true,`
`66`		`- "variations": []`
	`66`	`+ "variations": ["grpc", "mongodb"]`
`67`	`67`	`}`
`68`	`68`	`]`