Restructured to support multiple tags

Author: OskarLiew

README.md

@@ -1,105 +1,25 @@
+# Daeploy Builder Images
 
-# Creating a basic S2I builder image  
+This repository contains s2i builder images designed for Daeploy.
 
-## Getting started  
-
-### Files and Directories
-
-| File                   | Required? | Description                                                  |
-|------------------------|-----------|--------------------------------------------------------------|
-| Dockerfile             | Yes       | Defines the base builder image                               |
-| s2i/bin/assemble       | Yes       | Script that builds the application                           |
-| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
-| s2i/bin/run            | Yes       | Script that runs the application                             |
-| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
-| test/run               | No        | Test script for the builder image                            |
-| test/test-app          | Yes       | Test application source code                                 |
-
-#### Dockerfile
-
-Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
-
-#### S2I scripts
-
-##### assemble
-
-Create an *assemble* script that will build our application, e.g.:
-
-- build python modules
-- bundle install ruby gems
-- setup application specific configuration
-
-The script can also specify a way to restore any saved artifacts from the previous image.
-
-##### run
-
-Create a *run* script that will start the application.
-
-##### save-artifacts (optional)
-
-Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
-
-##### usage (optional)
-
-Create a *usage* script that will print out instructions on how to use the image.
-
-##### Make the scripts executable
-
-Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
-
-#### Create the builder image
-
-The following command will create a builder image named daeploy/s2i-python based on the Dockerfile that was created previously.
+## Creating the image
 
 ```bash
-docker build -t daeploy/s2i-python .
+docker build -t daeploy/s2i-python:tag ./path/to/image/dir
 ```
 
-The builder image can also be created by using the *make* command since a *Makefile* is included.
-
-Once the image has finished building, the command *s2i usage daeploy/s2i-python* will print out the help info that was defined in the *usage* script.
-
-#### Testing the builder image
-
-The builder image can be tested using the following commands:
-
-```bash
-docker build -t daeploy/s2i-python-candidate .
-IMAGE_NAME=daeploy/s2i-python-candidate test/run
-```
-
-The builder image can also be tested by using the *make test* command since a *Makefile* is included.
-
-#### Creating the application image
+## Using the image
 
-The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
-The following command will create the application image:
+Use the builder image to create an application from source code or a git repo
 
 ```bash
-s2i build test/test-app daeploy/s2i-python daeploy/s2i-python-app
+$ s2i build test/test-app daeploy/s2i-python s2i-python-app
 ---> Building and installing application from source...
 ```
 
-Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory.
-
-#### Running the application image
-
-Running the application image is as simple as invoking the docker run command:
+Deploy the application
 
 ```bash
-docker run -d -p 8080:8080 daeploy/s2i-python-app
-```
-
-The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
-
-#### Using the saved artifacts script
-
-Rebuilding the application using the saved artifacts can be accomplished using the following command:
-
-```bash
-s2i build --incremental=true test/test-app nginx-centos7 nginx-app
----> Restoring build artifacts...
+$ daeploy deploy name version -i s2i-python-app
 ---> Building and installing application from source...
 ```
-
-This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.

Dockerfile python38-slim/DockerfileDockerfile renamed to python38-slim/Dockerfile

@@ -6,7 +6,7 @@ LABEL maintainer="Viking Analytics AB"
 ENV BUILDER_VERSION 1.0
 
 # Set labels used in OpenShift to describe the builder image
-LABEL io.k8s.description="Platform for building daeploy images with reduced size" \
+LABEL io.k8s.description="Platform for building Daeploy images with reduced size" \
     io.k8s.display-name="Daeploy python builder" \
     io.openshift.expose-services="8080:http" \
     io.openshift.tags="builder,daeploy,python." \

Makefile python38-slim/MakefileMakefile renamed to python38-slim/Makefile

@@ -0,0 +1,105 @@
+
+# Creating a basic S2I builder image  
+
+## Getting started  
+
+### Files and Directories
+
+| File                   | Required? | Description                                                  |
+|------------------------|-----------|--------------------------------------------------------------|
+| Dockerfile             | Yes       | Defines the base builder image                               |
+| s2i/bin/assemble       | Yes       | Script that builds the application                           |
+| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
+| s2i/bin/run            | Yes       | Script that runs the application                             |
+| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
+| test/run               | No        | Test script for the builder image                            |
+| test/test-app          | Yes       | Test application source code                                 |
+
+#### Dockerfile
+
+Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+
+#### S2I scripts
+
+##### assemble
+
+Create an *assemble* script that will build our application, e.g.:
+
+- build python modules
+- bundle install ruby gems
+- setup application specific configuration
+
+The script can also specify a way to restore any saved artifacts from the previous image.
+
+##### run
+
+Create a *run* script that will start the application.
+
+##### save-artifacts (optional)
+
+Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+
+##### usage (optional)
+
+Create a *usage* script that will print out instructions on how to use the image.
+
+##### Make the scripts executable
+
+Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+
+#### Create the builder image
+
+The following command will create a builder image named daeploy/s2i-python based on the Dockerfile that was created previously.
+
+```bash
+docker build -t daeploy/s2i-python .
+```
+
+The builder image can also be created by using the *make* command since a *Makefile* is included.
+
+Once the image has finished building, the command *s2i usage daeploy/s2i-python* will print out the help info that was defined in the *usage* script.
+
+#### Testing the builder image
+
+The builder image can be tested using the following commands:
+
+```bash
+docker build -t daeploy/s2i-python-candidate .
+IMAGE_NAME=daeploy/s2i-python-candidate test/run
+```
+
+The builder image can also be tested by using the *make test* command since a *Makefile* is included.
+
+#### Creating the application image
+
+The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
+The following command will create the application image:
+
+```bash
+s2i build test/test-app daeploy/s2i-python daeploy/s2i-python-app
+---> Building and installing application from source...
+```
+
+Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory.
+
+#### Running the application image
+
+Running the application image is as simple as invoking the docker run command:
+
+```bash
+docker run -d -p 8080:8080 daeploy/s2i-python-app
+```
+
+The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
+
+#### Using the saved artifacts script
+
+Rebuilding the application using the saved artifacts can be accomplished using the following command:
+
+```bash
+s2i build --incremental=true test/test-app nginx-centos7 nginx-app
+---> Restoring build artifacts...
+---> Building and installing application from source...
+```
+
+This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.