docker-php74/php

Add new key for Gabriel

Commit 72df29ad · Tianon Gravi · 2022-10-28T09:13:33-07:00

Changeset

72df29ad263c287fb1da12855da111125eaa47a1

Parents

98c4766566bccd176f7a4e45c1b55227d5a47516

View source at this commit

Add new key for Gabriel

See https://www.php.net/gpg-keys.php#gpg-8.0

Comments

No comments yet.

Log in to comment

Diff

diff --git a/8.0/alpine3.15/cli/Dockerfile b/8.0/alpine3.15/cli/Dockerfile
index f37e7269..ef56a714 100644
--- a/8.0/alpine3.15/cli/Dockerfile
+++ b/8.0/alpine3.15/cli/Dockerfile
@@ -55,7 +55,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/alpine3.15/fpm/Dockerfile b/8.0/alpine3.15/fpm/Dockerfile
index 251a9910..1ab30693 100644
--- a/8.0/alpine3.15/fpm/Dockerfile
+++ b/8.0/alpine3.15/fpm/Dockerfile
@@ -55,7 +55,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/alpine3.15/zts/Dockerfile b/8.0/alpine3.15/zts/Dockerfile
index 72abc315..b9a52cf9 100644
--- a/8.0/alpine3.15/zts/Dockerfile
+++ b/8.0/alpine3.15/zts/Dockerfile
@@ -55,7 +55,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/alpine3.16/cli/Dockerfile b/8.0/alpine3.16/cli/Dockerfile
index 1e57ae83..6ccc6fc4 100644
--- a/8.0/alpine3.16/cli/Dockerfile
+++ b/8.0/alpine3.16/cli/Dockerfile
@@ -55,7 +55,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/alpine3.16/fpm/Dockerfile b/8.0/alpine3.16/fpm/Dockerfile
index 4aaa4e3b..f8ca96a1 100644
--- a/8.0/alpine3.16/fpm/Dockerfile
+++ b/8.0/alpine3.16/fpm/Dockerfile
@@ -55,7 +55,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/alpine3.16/zts/Dockerfile b/8.0/alpine3.16/zts/Dockerfile
index 46a2ef98..e104bc25 100644
--- a/8.0/alpine3.16/zts/Dockerfile
+++ b/8.0/alpine3.16/zts/Dockerfile
@@ -55,7 +55,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/bullseye/apache/Dockerfile b/8.0/bullseye/apache/Dockerfile
index 0d0a1ddc..94777e25 100644
--- a/8.0/bullseye/apache/Dockerfile
+++ b/8.0/bullseye/apache/Dockerfile
@@ -116,7 +116,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/bullseye/cli/Dockerfile b/8.0/bullseye/cli/Dockerfile
index 289df277..2cefc03a 100644
--- a/8.0/bullseye/cli/Dockerfile
+++ b/8.0/bullseye/cli/Dockerfile
@@ -58,7 +58,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile
index d4631a4b..f2c51476 100644
--- a/8.0/bullseye/fpm/Dockerfile
+++ b/8.0/bullseye/fpm/Dockerfile
@@ -58,7 +58,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile
index 49bcbfe3..d4803ca5 100644
--- a/8.0/bullseye/zts/Dockerfile
+++ b/8.0/bullseye/zts/Dockerfile
@@ -58,7 +58,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile
index 7d3a1ce2..e27062b6 100644
--- a/8.0/buster/apache/Dockerfile
+++ b/8.0/buster/apache/Dockerfile
@@ -116,7 +116,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile
index 79b4895a..2a4d1ef5 100644
--- a/8.0/buster/cli/Dockerfile
+++ b/8.0/buster/cli/Dockerfile
@@ -58,7 +58,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile
index ffabe1fc..bc8f6d87 100644
--- a/8.0/buster/fpm/Dockerfile
+++ b/8.0/buster/fpm/Dockerfile
@@ -58,7 +58,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile
index 00701ae4..344abcf4 100644
--- a/8.0/buster/zts/Dockerfile
+++ b/8.0/buster/zts/Dockerfile
@@ -58,7 +58,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
+ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4
 
 ENV PHP_VERSION 8.0.24
 ENV PHP_URL="https://www.php.net/distributions/php-8.0.24.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.24.tar.xz.asc"
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index f6789f74..37280177 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -179,7 +179,8 @@ ENV GPG_KEYS {{
 			# https://wiki.php.net/todo/php80#release_managers
 			# https://www.php.net/gpg-keys.php#gpg-8.0
 			"1729 F839 38DA 44E2 7BA0  F4D3 DBDB 3974 70D1 2172", # pollita
-			"BFDD D286 4282 4F81 18EF  7790 9B67 A5C1 2229 118F"  # carusogabriel
+			"BFDD D286 4282 4F81 18EF  7790 9B67 A5C1 2229 118F", # carusogabriel
+			"2C16 C765 DBE5 4A08 8130  F1BC 4B9B 5F60 0B55 F3B4"  # carusogabriel
 		],
 
 		"7.4": [