Skip to content

Commit 507205a

Browse files
committed
Remove PHP-8.1 from Makefile.
It is not tested at all. The whole version can be deprecated. Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent 9eca57f commit 507205a

File tree

5 files changed

+4
-61
lines changed

5 files changed

+4
-61
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Include common Makefile code.
22
BASE_IMAGE_NAME = php
3-
VERSIONS = 7.4 8.0 8.1 8.2 8.3
3+
VERSIONS = 7.4 8.0 8.2 8.3
44
OPENSHIFT_NAMESPACES =
55

66
# HACK: Ensure that 'git pull' for old clones doesn't cause confusion.

imagestreams/imagestreams.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
app_versions: ["7.4", "8.0", "8.2"]
1818

1919
- name: UBI 9
20-
app_versions: ["8.0", "8.1", "8.2", "8.3"]
20+
app_versions: ["8.0", "8.2", "8.3"]
2121

2222
- name: UBI 10
2323
app_versions: ["8.3"]
@@ -29,7 +29,7 @@
2929
app_versions: ["7.4", "8.0", "8.2"]
3030

3131
- name: UBI 9
32-
app_versions: ["8.0", "8.1", "8.2", "8.3"]
32+
app_versions: ["8.0", "8.2", "8.3"]
3333

3434
- name: UBI 10
3535
app_versions: ["8.3"]
@@ -41,7 +41,7 @@
4141
app_versions: ["7.4", "8.0", "8.2"]
4242

4343
- name: UBI 9
44-
app_versions: ["8.0", "8.1", "8.2", "8.3"]
44+
app_versions: ["8.0", "8.2", "8.3"]
4545

4646
- name: UBI 10
4747
app_versions: ["8.3"]

imagestreams/php-centos.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,6 @@
8585
"type": "Local"
8686
}
8787
},
88-
{
89-
"name": "8.1-ubi9",
90-
"annotations": {
91-
"openshift.io/display-name": "PHP 8.1 (UBI 9)",
92-
"openshift.io/provider-display-name": "Red Hat, Inc.",
93-
"description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.",
94-
"iconClass": "icon-php",
95-
"tags": "builder,php",
96-
"version": "8.1",
97-
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
98-
},
99-
"from": {
100-
"kind": "DockerImage",
101-
"name": "registry.access.redhat.com/ubi9/php-81:latest"
102-
},
103-
"referencePolicy": {
104-
"type": "Local"
105-
}
106-
},
10788
{
10889
"name": "8.2-ubi9",
10990
"annotations": {

imagestreams/php-rhel-aarch64.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,6 @@
8585
"type": "Local"
8686
}
8787
},
88-
{
89-
"name": "8.1-ubi9",
90-
"annotations": {
91-
"openshift.io/display-name": "PHP 8.1 (UBI 9)",
92-
"openshift.io/provider-display-name": "Red Hat, Inc.",
93-
"description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.",
94-
"iconClass": "icon-php",
95-
"tags": "builder,php",
96-
"version": "8.1",
97-
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
98-
},
99-
"from": {
100-
"kind": "DockerImage",
101-
"name": "registry.redhat.io/ubi9/php-81:latest"
102-
},
103-
"referencePolicy": {
104-
"type": "Local"
105-
}
106-
},
10788
{
10889
"name": "8.2-ubi9",
10990
"annotations": {

imagestreams/php-rhel.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,6 @@
8585
"type": "Local"
8686
}
8787
},
88-
{
89-
"name": "8.1-ubi9",
90-
"annotations": {
91-
"openshift.io/display-name": "PHP 8.1 (UBI 9)",
92-
"openshift.io/provider-display-name": "Red Hat, Inc.",
93-
"description": "Build and run PHP 8.1 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.",
94-
"iconClass": "icon-php",
95-
"tags": "builder,php",
96-
"version": "8.1",
97-
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
98-
},
99-
"from": {
100-
"kind": "DockerImage",
101-
"name": "registry.redhat.io/ubi9/php-81:latest"
102-
},
103-
"referencePolicy": {
104-
"type": "Local"
105-
}
106-
},
10788
{
10889
"name": "8.2-ubi9",
10990
"annotations": {

0 commit comments

Comments
 (0)