Update usage to proper detection of name

Add to examples Dockerfile and Dockerfile.s2i
notes what source-to-image means

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

2.4-micro/s2i/bin/usage

@@ -15,7 +15,7 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ ${NAMESPACE}/httpd-24-${DISTRO}7 httpd-sample-app
+s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ ${NAMESPACE}/httpd-24${DISTRO} httpd-sample-app
 
 You can then run the resulting image via:
 podman run -p 8080:8080 httpd-sample-app

2.4/s2i/bin/usage

@@ -15,7 +15,7 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ ${NAMESPACE}/httpd-24-${DISTRO}7 httpd-sample-app
+s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ ${NAMESPACE}/httpd-24${DISTRO} httpd-sample-app
 
 You can then run the resulting image via:
 podman run -p 8080:8080 httpd-sample-app

examples/Dockerfile

@@ -1,4 +1,14 @@
-FROM registry.redhat.io/rhel8/httpd-24
+FROM registry.redhat.io/rhel10/httpd-24
+
+# This image supports the Source-to-Image
+# 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
 ADD app-src/index.html /var/www/html/index.html

examples/Dockerfile.s2i

@@ -1,7 +1,6 @@
-FROM registry.redhat.io/rhel8/httpd-24
+FROM registry.redhat.io/rhel10/httpd-24
 
 # 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

examples/sample-test-app/Dockerfile

@@ -1,5 +1,14 @@
-FROM registry.redhat.io/rhel8/httpd-24
+FROM registry.redhat.io/rhel10/httpd-24
 
+# This image supports the Source-to-Image
+# 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
 ADD index.html /var/www/html/index.html
 

examples/sample-test-app/Dockerfile.s2i

@@ -1,10 +1,18 @@
-FROM registry.redhat.io/rhel8/httpd-24
+FROM registry.redhat.io/rhel10/httpd-24
 
+# This image supports the Source-to-Image
+# 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
 ADD . /tmp/src
 
 # Assemble script installs the dependencies
-# TODO: describe what assemble does, and link to https://docs.openshift.com/container-platform/3.11/creating_images/s2i.html
 RUN /usr/libexec/s2i/assemble
 
 # Run script uses standard ways to run the application