Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Commit 8f3f2c9

Browse files
authored
Merge pull request #14 from storageos/rh-certification
Add metadata for RH certification, bump to 1.0.1
2 parents f0d80cc + acf20ad commit 8f3f2c9

File tree

3 files changed

+38
-11
lines changed

3 files changed

+38
-11
lines changed

Dockerfile

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
1-
FROM golang:1.12.9 AS build
1+
FROM golang:1.13.5 AS build
2+
23
WORKDIR /go/src/github.com/storageos/init/
34
COPY . /go/src/github.com/storageos/init/
45
RUN make build
56

67
FROM registry.access.redhat.com/ubi8/ubi
8+
LABEL name="StorageOS Init" \
9+
maintainer="[email protected]" \
10+
vendor="StorageOS" \
11+
version="1.0.1" \
12+
release="1" \
13+
distribution-scope="public" \
14+
architecture="x86_64" \
15+
url="https://docs.storageos.com" \
16+
io.k8s.description="The StorageOS Init container prepares a node for running StorageOS." \
17+
io.k8s.display-name="StorageOS Init" \
18+
io.openshift.tags="storageos,storage,operator,pv,pvc,storageclass,persistent,csi" \
19+
summary="Highly-available persistent block storage for containerized applications." \
20+
description="StorageOS transforms commodity server or cloud based disk capacity into enterprise-class storage to run persistent workloads such as databases in containers. Provides high availability, low latency persistent block storage. No other hardware or software is required."
21+
722
RUN yum -y update && \
823
yum -y install --disableplugin=subscription-manager kmod
24+
925
COPY scripts/ /scripts
26+
COPY --from=build /go/src/github.com/storageos/init/LICENSE /licenses/
1027
COPY --from=build /go/src/github.com/storageos/init/build/_output/bin/init /init
1128
CMD /init -scripts=/scripts

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,8 @@ run:
3838
# Generate mocks.
3939
generate:
4040
go generate ./...
41+
42+
# Prepare the repo for a new release. Run:
43+
# NEW_VERSION=<version> make release
44+
release:
45+
sed -i -e "s/version=.*/version=\"$(NEW_VERSION)\" \\\/g" Dockerfile

README.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,32 @@
44

55
Init container to prepare the environment for StorageOS.
66

7-
87
## Options
98

109
* `-scripts` - absolute path of the scripts directory.
1110
* `-nodeImage` - StorageOS Node container image that the init container runs along. This should be used when running out of k8s.
1211
* `-dsName` - StorageOS k8s DaemonSet name. Use when running within a k8s cluster.
1312
* `-dsNamespace` - StorageOS k8s DaemonSet namespace. Use when running within a k8s cluster.
1413

15-
1614
## Environment Variables
1715

1816
* `NODE_IMAGE` - StorageOS Node container image.
1917
* `DAEMONSET_NAME` - StorageOS DaemonSet name.
2018
* `DAEMONSET_NAMESPACE` - StorageOS DaemonSet namespace.
2119

22-
2320
## Build
2421

25-
```
26-
$ make image IMAGE=storageos/init:test
22+
```console
23+
make image IMAGE=storageos/init:test
2724
```
2825

26+
## Release
27+
28+
The version must be set in the `Dockerfile`. To set it, run:
29+
30+
```console
31+
NEW_VERSION=<version> make release
32+
```
2933

3034
## Run it on host
3135

@@ -34,10 +38,9 @@ Build the init container with `make image` and run it on the host with
3438

3539
Pass a StorageOS Node image and scripts directory as:
3640

41+
```console
42+
make run SCRIPTS_PATH=scripts/ NODE_IMAGE=storageos/node:1.4.0
3743
```
38-
$ make run SCRIPTS_PATH=scripts/ NODE_IMAGE=storageos/node:1.4.0
39-
```
40-
4144

4245
## Script Framework
4346

@@ -54,7 +57,8 @@ The scripts must start with shebang (`#!/bin/bash` for bash scripts) and must
5457
have executable permission(`chmod +x`).
5558

5659
Example scripts dir:
57-
```
60+
61+
```console
5862
scripts
5963
├── 01-script.sh
6064
├── 05-foo
@@ -67,7 +71,8 @@ scripts
6771
```
6872

6973
In the above example, the script execution order will be
70-
```
74+
75+
```console
7176
01-script.sh, scriptx.sh, 07-scriptz.sh, scripty.sh
7277
```
7378

0 commit comments

Comments
 (0)