Skip to content

Commit

Permalink
Merge pull request #37 from boschresearch/fix/docker-image-tag-jenkins
Browse files Browse the repository at this point in the history
Fix docker image tagging in  jenkins
  • Loading branch information
Robert Hoettger committed Aug 25, 2020
2 parents 87c27c0 + eff1ad2 commit a696d9f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ node('docker') {
}
stage('Collect') {
sh '''
sudo docker save $(sudo docker images --filter "reference=amd64/kuksa-val*" -q | head -1) | bzip2 -9 > artifacts/kuksa-val-amd64.tar.bz2
sudo docker save $(sudo docker images --filter "reference=arm64/kuksa-val*" -q | head -1) | bzip2 -9 > artifacts/kuksa-val-arm64.tar.bz2
sudo docker save $(sudo docker images --filter "reference=amd64/kuksa-val*" --format "{{.Repository}}:{{.Tag}}" | head -1) | bzip2 -9 > artifacts/kuksa-val-amd64.tar.bz2
sudo docker save $(sudo docker images --filter "reference=amd64/kuksa-val*" --format "{{.Repository}}:{{.Tag}}" | head -1) | bzip2 -9 > artifacts/kuksa-val-arm64.tar.bz2
sudo docker save kuksa-val-dev:ubuntu20.04 | bzip2 -9 > artifacts/kuksa-val-dev-ubuntu20.04.tar.bz2
'''
}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,14 @@ sudo docker build . --build-arg http_proxy=$http_proxy --build-arg https_proxy=
Once Docker image is built, we can run it by using the run command:

```
sudo docker run -it -v $HOME/kuksaval.config:/config -e LOG_LEVEL=ALL amd64/kuksa-val:0.1.1
sudo docker run -it -v $HOME/kuksaval.config:/config -p 127.0.0.1:8090:8090 -e LOG_LEVEL=ALL amd64/kuksa-val:0.1.1
```
where `$HOME/kuksaval.config` is a directory on your host machine containing the KUKSA.VAL configuration. The directory can be empty, then it will be populated with an exmple configuration during start.

The environment variable `KUKSAVAL_OPTARGS` can be used to add arbitrary command line arguments e.g.

```
sudo docker run -it -v $HOME/kuksaval.config:/config -e LOG_LEVEL=ALL -e KUKSAVAL_OPTARGS="--insecure" amd64/kuksa-val:0.1.1
sudo docker run -it -v $HOME/kuksaval.config:/config -p 127.0.0.1:8090:8090 -e LOG_LEVEL=ALL -e KUKSAVAL_OPTARGS="--insecure" amd64/kuksa-val:0.1.1
```

Expand Down
2 changes: 1 addition & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# SPDX-License-Identifier: EPL-2.0
########################################################################

VERSION="0.1.1"
VERSION="0.1.2"
NAME="kuksa-val"

if [ -z "$VERSION" ]; then
Expand Down

0 comments on commit a696d9f

Please sign in to comment.