Skip to content

Commit

Permalink
cfssl 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
BertrandGouny committed Nov 15, 2019
1 parent 31088a7 commit 5f087a2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 16 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [0.3.1] - 2019-11-15
### Changed
- Upgrade cfssl version to 1.4.1

## [0.3.0] - 2019-11-10
## Added
- Multiarch support
Expand Down Expand Up @@ -34,6 +38,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## 0.1.0 - 2016-02-20
- Initial release

[0.3.1]: https://github.com/osixia/docker-cfssl-multirootca/compare/v0.3.0...v0.3.1
[0.3.0]: https://github.com/osixia/docker-cfssl-multirootca/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/osixia/docker-cfssl-multirootca/compare/v0.2.0...v0.2.1
[0.2.0]: https://github.com/osixia/docker-cfssl-multirootca/compare/v0.1.3...v0.2.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = osixia/cfssl-multirootca
VERSION = 0.3.0
VERSION = 0.3.1

.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version

Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

[hub]: https://hub.docker.com/r/osixia/cfssl-multirootca/

Latest release: 0.3.0 - cfssl multirootca 1.4.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/cfssl-multirootca/) 
Latest release: 0.3.1 - cfssl multirootca 1.4.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/cfssl-multirootca/) 


**A docker image to run cfssl multirootca tool.**
Expand All @@ -27,7 +27,7 @@ Latest release: 0.3.0 - cfssl multirootca 1.4.0 - [Changelog](CHANGELOG.md) | [D
- [Link environment file](#link-environment-file)
- [Make your own image or extend this image](#make-your-own-image-or-extend-this-image)
- [Advanced User Guide](#advanced-user-guide)
- [Extend osixia/cfssl-multirootca:0.3.0 image](#extend-osixiacfssl-multirootca030-image)
- [Extend osixia/cfssl-multirootca:0.3.1 image](#extend-osixiacfssl-multirootca031-image)
- [Make your own cfssl-multirootca image](#make-your-own-cfssl-multirootca-image)
- [Tests](#tests)
- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
Expand All @@ -52,7 +52,7 @@ By default HTTPS is disable.
#### Use autogenerated certificate
Add `--env CFSSL_MUTLTIROOTCA_HTTPS=true` to run command then a certificate is created with the container hostname (it can be set by docker run --hostname option eg: pki.my-company.com).

docker run --env CFSSL_MUTLTIROOTCA_HTTPS=true --hostname pki.my-company.com --detach osixia/cfssl-multirootca:0.3.0
docker run --env CFSSL_MUTLTIROOTCA_HTTPS=true --hostname pki.my-company.com --detach osixia/cfssl-multirootca:0.3.1

#### Use your own certificate

Expand All @@ -62,7 +62,7 @@ You can set your custom certificate at run time, add `--env CFSSL_MUTLTIROOTCA_H
--volume /path/to/certifates:/container/service/multirootca/assets/certs \
--env CFSSL_MUTLTIROOTCA_HTTPS_CRT_FILENAME=my.crt \
--env CFSSL_MUTLTIROOTCA_HTTPS_KEY_FILENAME=my.key \
--detach osixia/cfssl-multirootca:0.3.0
--detach osixia/cfssl-multirootca:0.3.1

Other solutions are available please refer to the [Advanced User Guide](#advanced-user-guide)

Expand All @@ -72,7 +72,7 @@ You may have some problems with mounted files on some systems. The startup scrip

To fix that run the container with `--copy-service` argument :

docker run [your options] osixia/cfssl-multirootca:0.3.0 --copy-service
docker run [your options] osixia/cfssl-multirootca:0.3.1 --copy-service

### Debug

Expand All @@ -81,11 +81,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.

Example command to run the container in `debug` mode:

docker run --detach osixia/cfssl-multirootca:0.3.0 --loglevel debug
docker run --detach osixia/cfssl-multirootca:0.3.1 --loglevel debug

See all command line options:

docker run osixia/cfssl-multirootca:0.3.0 --help
docker run osixia/cfssl-multirootca:0.3.1 --help


## Environment Variables
Expand Down Expand Up @@ -123,7 +123,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab

If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:

docker run --env CFSSL_MULTIROOTCA_ROOTS="#PYTHON2BASH:[{'primary':[{'private':'file://testdata/server.key'},{'certificate':'testdata/server.crt'},{'config': 'testdata/config.json'},{'nets': '10.0.2.1/24,172.16.3.1/24, 192.168.3.15/32'}]},{'backup': [{'private': 'file://testdata/server.key'},{'certificate': 'testdata/server.crt'},{'config':'testdata/config.json'}]" --detach osixia/cfssl-multirootca:0.3.0
docker run --env CFSSL_MULTIROOTCA_ROOTS="#PYTHON2BASH:[{'primary':[{'private':'file://testdata/server.key'},{'certificate':'testdata/server.crt'},{'config': 'testdata/config.json'},{'nets': '10.0.2.1/24,172.16.3.1/24, 192.168.3.15/32'}]},{'backup': [{'private': 'file://testdata/server.key'},{'certificate': 'testdata/server.crt'},{'config':'testdata/config.json'}]" --detach osixia/cfssl-multirootca:0.3.1

To convert yaml to python online: http://yaml-online-parser.appspot.com/

Expand All @@ -143,14 +143,14 @@ Other configuration:
Environment variables can be set by adding the --env argument in the command line, for example:

docker run --env CFSSL_MUTLTIROOTCA_HTTPS="true" \
--detach osixia/cfssl-multirootca:0.3.0
--detach osixia/cfssl-multirootca:0.3.1

#### Link environment file

For example if your environment file is in : `/data/environment/my-env.yaml`

docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
--detach osixia/cfssl-multirootca:0.3.0
--detach osixia/cfssl-multirootca:0.3.1

Take care to link your environment file to `/container/environment/XX-somedir` (with XX < 99 so they will be processed before default environment files) and not directly to `/container/environment` because this directory contains predefined baseimage environment files to fix container environment (INITRD, LANG, LANGUAGE and LC_CTYPE).

Expand All @@ -160,13 +160,13 @@ This is the best solution if you have a private registry. Please refer to the [A

## Advanced User Guide

### Extend osixia/cfssl-multirootca:0.3.0 image
### Extend osixia/cfssl-multirootca:0.3.1 image

If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image.

Dockerfile example:

FROM osixia/cfssl-multirootca:0.3.0
FROM osixia/cfssl-multirootca:0.3.1
MAINTAINER Your Name <[email protected]>

ADD https-certs /container/service/multiroot/assets/certs
Expand Down Expand Up @@ -198,7 +198,7 @@ Build your image :

Run your image :

docker run -d billy-the-king/cfssl-multirootca:0.3.0
docker run -d billy-the-king/cfssl-multirootca:0.3.1

### Tests

Expand Down
4 changes: 2 additions & 2 deletions image/service/multirootca/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ esac
echo "Going to use ${HOST_ARCH} cfssl binaries"

echo "Download cfssl ..."
echo "curl -o /usr/local/bin/multirootca -SL https://github.com/osixia/cfssl/releases/download/1.4.0/multirootca_linux-${HOST_ARCH}"
curl -o /usr/local/bin/multirootca -SL "https://github.com/osixia/cfssl/releases/download/1.4.0/multirootca_linux-${HOST_ARCH}"
echo "curl -o /usr/local/bin/multirootca -SL https://github.com/osixia/cfssl/releases/download/1.4.1/multirootca_linux-${HOST_ARCH}"
curl -o /usr/local/bin/multirootca -SL "https://github.com/osixia/cfssl/releases/download/1.4.1/multirootca_linux-${HOST_ARCH}"

chmod +x /usr/local/bin/multirootca

Expand Down

0 comments on commit 5f087a2

Please sign in to comment.