sclorg · phracek · Aug 25, 2023 · Aug 23, 2023 · Aug 23, 2023 · Aug 23, 2023
diff --git a/8.1/test/examples/from-dockerfile/.gitignore b/8.1/test/examples/from-dockerfile/.gitignore
@@ -0,0 +1 @@
+app-src
diff --git a/8.1/test/examples/from-dockerfile/Dockerfile b/8.1/test/examples/from-dockerfile/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubi8/php-73
+
+USER 0
+# Add application sources
+ADD app-src .
+RUN chown -R 1001:0 .
+USER 1001
+
+# Install the dependencies
+RUN TEMPFILE=$(mktemp) && \
+    curl -o "$TEMPFILE" "https://getcomposer.org/installer" && \
+    php <"$TEMPFILE" && \
+    ./composer.phar install --no-interaction --no-ansi --optimize-autoloader
+
+# Run script uses standard ways to configure the PHP application
+# and execs httpd -D FOREGROUND at the end
+# See more in <version>/s2i/bin/run in this repository.
+# Shortly what the run script does: The httpd daemon and php needs to be
+# configured, so this script prepares the configuration based on the container
+# parameters (e.g. available memory) and puts the configuration files into
+# the approriate places.
+# This can obviously be done differently, and in that case, the final CMD
+# should be set to "CMD httpd -D FOREGROUND" instead.
+CMD /usr/libexec/s2i/run
diff --git a/8.1/test/examples/from-dockerfile/Dockerfile.s2i b/8.1/test/examples/from-dockerfile/Dockerfile.s2i
@@ -0,0 +1,25 @@
+FROM registry.access.redhat.com/ubi8/php-73
+
+# This image supports the Source-to-Image
+# (see more at https://docs.openshift.com/container-platform/3.11/creating_images/s2i.html).
+# In order to support the Source-to-Image framework, there are some interesting
+# scripts inside the builder image, that can be run in a Dockerfile directly as well:
+# * The `/usr/libexec/s2i/assemble` script inside the image is run in order
+#   to produce a new image with the application artifacts.
+#   The script takes sources of a given application and places them into
+#   appropriate directories inside the image.
+# * The `/usr/libexec/s2i/run` script executes the application and is set as
+#   a default command in the resulting container image.
+
+# Add application sources to a directory that the assemble script expects them
+# and set permissions so that the container runs without root access
+USER 0
+ADD app-src /tmp/src
+RUN chown -R 1001:0 /tmp/src
+USER 1001
+
+# Let the assemble script to install the dependencies
+RUN /usr/libexec/s2i/assemble
+
+# Run script uses standard ways to run the application
+CMD /usr/libexec/s2i/run
diff --git a/8.1/test/examples/from-dockerfile/README.md b/8.1/test/examples/from-dockerfile/README.md
@@ -0,0 +1,22 @@
+Dockerfile examples
+===================
+
+This directory contains example Dockerfiles that demonstrate how to use the image with a Dockerfile and `podman build`.
+
+For demonstration, we use an application code available at https://github.com/sclorg/cakephp-ex.git.
+
+Pull the source to the local machine first:
+```
+git clone https://github.com/sclorg/cakephp-ex.git app-src
+```
+
+Then, build a new image from a Dockerfile in this directory:
+```
+podman build -f Dockerfile -t cakephp-app .
+```
+
+And run the resulting image with the final application:
+```
+podman run -ti --rm cakephp-app
+```
+
diff --git a/8.1/test/examples/self-signed-ssl/httpd-ssl/certs/server-cert-selfsigned.pem b/8.1/test/examples/self-signed-ssl/httpd-ssl/certs/server-cert-selfsigned.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIJAI4x7HuBG49oMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
+BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
+Q29tcGFueSBMdGQwHhcNMTcxMjAzMjMzMzU3WhcNMTgwMTAyMjMzMzU3WjBCMQsw
+CQYDVQQGEwJYWDEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZh
+dWx0IENvbXBhbnkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+vH4Vdq0a3UWUQd8Z6s2csxhxjAOyUx0rszGL0m3uTjQido6JRBdjN2dXiZc3LFoq
+YeOKR3CeHsn7UdrlzaboHFDfjAaextse0740mB1g14H1bAS0POuTPeKa+3wGfzCb
+sTSXnfSrICl3n2D/3KSO93WwmS90kBD6HmKt5nfkLpJnROM/4bHmuoV0Ry8CDjzj
+mka7pQU4yzyMKLU3sHpncZU6g7o4Vezic9ksVzIAbdPCSbF7ktVz/hisyCuzyKN6
+s2327jq593vBgGOsNU5PDPDjKW74Q0Bv/FxPK4nx+o4IkcRW1QEb+yAx8XOM7CDZ
+ViKvI/A0b+Y4Y3rIQ465+wIDAQABo1MwUTAdBgNVHQ4EFgQUAY1i6ZNbqO1+46aw
+pldCyPaWoYswHwYDVR0jBBgwFoAUAY1i6ZNbqO1+46awpldCyPaWoYswDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEADhGjnYGq9JvQcygMYEQiIdyS
+t06Nu7NUkWz52GJp7WFognWyG+0jAomBR0GSUchfubvVZ7cHIaVKLhiGOqg+HIol
+7tNRfvE6x/Idk674g6OTRAWxO/wOlgnRMpRy6XhHOtb4HcPcpWFZJS8MC8+HRWIs
+kzMErXe0/obnKn9O04kcEREfmB7kfcD4ooqk5gwbdQk1W6a44LcN6AB5qYPjOzgF
+Qnb2aLQW9XhgNhiMsYqDzCZsy0az0rz7NgkVOnKrGJ8x3kVX13GR2joVVHOazms9
+Gd90z+mLMDTbqCRGIPMLvEp4HtAmBxbgsj/zHyinajIqV96B3Cr3zTdW29lHJg==
+-----END CERTIFICATE-----
diff --git a/8.1/test/examples/self-signed-ssl/httpd-ssl/private/server-key.pem b/8.1/test/examples/self-signed-ssl/httpd-ssl/private/server-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC8fhV2rRrdRZRB
+3xnqzZyzGHGMA7JTHSuzMYvSbe5ONCJ2jolEF2M3Z1eJlzcsWiph44pHcJ4eyftR
+2uXNpugcUN+MBp7G2x7TvjSYHWDXgfVsBLQ865M94pr7fAZ/MJuxNJed9KsgKXef
+YP/cpI73dbCZL3SQEPoeYq3md+QukmdE4z/hsea6hXRHLwIOPOOaRrulBTjLPIwo
+tTewemdxlTqDujhV7OJz2SxXMgBt08JJsXuS1XP+GKzIK7PIo3qzbfbuOrn3e8GA
+Y6w1Tk8M8OMpbvhDQG/8XE8rifH6jgiRxFbVARv7IDHxc4zsINlWIq8j8DRv5jhj
+eshDjrn7AgMBAAECggEARZxeutxE/pCypv0IqkFS7IVLccTvt2gfemcC1yzIBFOW
+oqgTI3Vrq8tbdbHFq3iFDG+m4qlBi+dWDC3GDoPkVoi7dg//1TqZEOO+sqqu2Afj
+pge6tIDfeMxWJifwkkpWRURB9hCknhUSW2bMNyUCs3rgREJVTtsmM9CHnoSKXXQL
+aOeYXalFVpx3ceK+xdp0VGfpsqEabBKs0yy3EDiQy2huoWce3EVFLVrwx/IkhcsZ
+JlI5LPpoiTglSs1g9i88JHS2slBtKtb1lWl/yXHhK1g7s34c6f9jP8snuFE5ddMn
+0L4GDA9teaPGvB533eb2RIFy2kUYgpr5c03G6rpoOQKBgQDpY6BFJkPGENnC5Bdb
+fJCuN2nyRdC1qvv6ESFaQYb0s6QjKDqpb0dUSYN3+zNgtiAysbQLeU/d9mmt4UR8
+ohjRkOySU0eQ/YNFokjw6g6GPoiMHJJ9cP75NA94uIMIUTY7uHEWWZwXI5UphdPC
+p5/3MaF1VlYQys9a5wtiEaDSfQKBgQDOwPV0zQjUabkVQ4yV0amP8xybvHH8ghG0
+RMStHg96RfDmg35JQaw22A2xiVROCoZgLqiE1DFSl/3gBF/vfqBh/uzdxwNerJC6
+ROdCxyS4rys5d/02P4aNOa73sD+ZKyEZRTF1v3bmOGKidRFF5oxIpuHjFWlJFKx1
+O/b3AI0v1wKBgQC/L4N84emm+OrKAfs4UIRckrxRYOulxhmAMkQ2IXOiRP5yZmQX
+pDa0TzxJLxhZYxhhLr0koQ3R8CeF7wEhb9AQ7D0/aMU5etLsWhKSd8nKIrPMwyMl
+a0kTb5g09kEwsQZSSbcp7eI1+koYp65eyN37q0ZuTnlWbC0MdDQY9APgKQKBgQCb
+HqaKNXLUe2XDkGSf2ygOumXSanZS7vt9dsLg59bQ9DyjljBfogglNcBAXTqFOtxK
+uXbyAYnn3+U399BKjYSjQXJRioj6tRn4xs2DiooAjlwtx9qQouS+fHLLns54iqVQ
+oltTbo00eUV3gcGt4iWKNLrxdxUBIaOqaY0HEMDdDQKBgQCRvcHDF7JSPuBiO3Tw
+PSOUD4q6dD/dhI+X2ZKg83w94SZXXms6eMSbedUkLoJ8TDunmdRUUWb6rgP/pJwr
+zKRTskItF15i9IWCwC6jBrSfx5n2JcSoBALyc0aR9heF0GQjWwqURd+PC/msomrW
+z9SCl8mpQVFtBlui7PcnDLTFAg==
+-----END PRIVATE KEY-----
diff --git a/8.1/test/examples/self-signed-ssl/index.html b/8.1/test/examples/self-signed-ssl/index.html
@@ -0,0 +1 @@
+SSL test works
diff --git a/8.1/test/imagestreams/php-centos.json b/8.1/test/imagestreams/php-centos.json
@@ -0,0 +1,133 @@
+{
+  "kind": "ImageStream",
+  "apiVersion": "image.openshift.io/v1",
+  "metadata": {
+    "name": "php",
+    "annotations": {
+      "openshift.io/display-name": "PHP"
+    }
+  },
+  "spec": {
+    "tags": [
+      {
+        "name": "latest",
+        "annotations": {
+          "openshift.io/display-name": "PHP (Latest)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major version updates.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "ImageStreamTag",
+          "name": "8.0-ubi8"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "8.0-ubi9",
+        "annotations": {
+          "openshift.io/display-name": "PHP 8.0 (UBI 9)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 8.0 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.0/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php:8.0,php",
+          "version": "8.0",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.access.redhat.com/ubi9/php-80:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "8.0-ubi8",
+        "annotations": {
+          "openshift.io/display-name": "PHP 8.0 (UBI 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 8.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php:8.0,php",
+          "version": "8.0",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.access.redhat.com/ubi8/php-80:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "7.4-ubi8",
+        "annotations": {
+          "openshift.io/display-name": "PHP 7.4 (UBI 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 7.4 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.4/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php:7.4,php",
+          "version": "7.4",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.access.redhat.com/ubi8/php-74:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "7.3-ubi7",
+        "annotations": {
+          "openshift.io/display-name": "PHP 7.3 (UBI 7)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 7.3 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php:7.3,php",
+          "version": "7.3",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.access.redhat.com/ubi7/php-73:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "7.3",
+        "annotations": {
+          "openshift.io/display-name": "PHP 7.3",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 7.3 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php,hidden",
+          "supports":"php:7.3,php",
+          "version": "7.3",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "quay.io/centos7/php-73-centos7:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      }
+    ]
+  }
+}
diff --git a/8.1/test/imagestreams/php-rhel-aarch64.json b/8.1/test/imagestreams/php-rhel-aarch64.json
@@ -0,0 +1,93 @@
+{
+  "kind": "ImageStream",
+  "apiVersion": "image.openshift.io/v1",
+  "metadata": {
+    "name": "php",
+    "annotations": {
+      "openshift.io/display-name": "PHP"
+    }
+  },
+  "spec": {
+    "tags": [
+      {
+        "name": "latest",
+        "annotations": {
+          "openshift.io/display-name": "PHP (Latest)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major version updates.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "ImageStreamTag",
+          "name": "8.0-ubi8"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "8.0-ubi9",
+        "annotations": {
+          "openshift.io/display-name": "PHP 8.0 (UBI 9)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 8.0 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.0/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php:8.0,php",
+          "version": "8.0",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/ubi9/php-80:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "8.0-ubi8",
+        "annotations": {
+          "openshift.io/display-name": "PHP 8.0 (UBI 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 8.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.0/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php:8.0,php",
+          "version": "8.0",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/ubi8/php-80:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "7.4-ubi8",
+        "annotations": {
+          "openshift.io/display-name": "PHP 7.4 (UBI 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and run PHP 7.4 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.4/README.md.",
+          "iconClass": "icon-php",
+          "tags": "builder,php",
+          "supports":"php:7.4,php",
+          "version": "7.4",
+          "sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/ubi8/php-74:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      }
+    ]
+  }
+}