openshift/source-to-image
1
0
Fork 0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00
Code Issues Releases Activity

sti -> s2i docs leftovers

Browse Source
This commit is contained in:
Maciej Szulik
2016-02-03 09:26:25 +01:00
parent 7064810ce0
commit 1bb1785da4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/builder_image.md
View File

@@ -2,7 +2,7 @@
The main advantage of using s2i for building reproducible docker images is ease
of use for developers. To meet that criteria you, as a builder image author,
should be aware of the two basic requirements for the best possible sti
should be aware of the two basic requirements for the best possible s2i
performance. These are:
* [required image contents](#required-image-contents)
@@ -49,7 +49,7 @@ are executable inside the builder image. The build searches the following locati
these scripts in the following order:
1. A script found at the `--scripts-url` URL
1. A script found in the application source `.sti/bin` directory
1. A script found in the application source `.s2i/bin` directory
1. A script found at the default image URL (`io.openshift.s2i.scripts-url` label)
Both the `io.openshift.s2i.scripts-url` label specified in the image and `--scripts-url` flag
@@ -79,18 +79,18 @@ and placing them into the appropriate directories inside the image. The workflow
#### Example `assemble` script:
**NOTE**: All the examples are written in [Bash](http://www.gnu.org/software/bash/)
and it is assumed that the tar contents unpack into the `/tmp/sti` directory.
and it is assumed that the tar contents unpack into the `/tmp/s2i` directory.
```
#!/bin/bash
# restore build artifacts
if [ "$(ls /tmp/sti/artifacts/ 2>/dev/null)" ]; then
mv /tmp/sti/artifacts/* $HOME/.
if [ "$(ls /tmp/s2i/artifacts/ 2>/dev/null)" ]; then
mv /tmp/s2i/artifacts/* $HOME/.
fi
# move the application source
mv /tmp/sti/src $HOME/src
mv /tmp/s2i/src $HOME/src
# build application artifacts
pushd ${HOME}

4
docs/cli.md
View File

@@ -37,7 +37,7 @@ There are four log levels:
# s2i create
The `s2i create` command is responsible for bootstrapping a new S2I enabled
image repository. This command will generate a skeleton `.sti` directory and
image repository. This command will generate a skeleton `.s2i` directory and
populate it with sample S2I scripts you can start hacking on.
Usage:
@@ -115,7 +115,7 @@ have permissions to delete files in the destination directory (eg. `/etc/ssl`).
You can also specify multiple directories, for example: `--inject /dir1:/container/dir1 --inject /dir2:container/dir2`.
You can use this feature to provide SSL certificates, private configuration
files which contains credentials, etc.
files which contains credentials, etc.
#### Callback URL