Merge branch 'master' into master-3.10

This commit is contained in:
aptalca 2019-07-02 15:56:33 -04:00 committed by GitHub
commit 720598282e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions

View File

@ -208,5 +208,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **02.07.19:** - Stop container if fleet fails.
* **19.05.19:** - Use new base images for arm versions.
* **01.04.19:** - Initial Release

View File

@ -74,6 +74,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
- { date: "02.07.19:", desc: "Rebasing to alpine 3.10." }
- { date: "02.07.19:", desc: "Stop container if fleet fails." }
- { date: "19.05.19:", desc: "Use new base images for arm versions." }
- { date: "01.04.19:", desc: "Initial Release" }

View File

@ -0,0 +1,3 @@
#!/usr/bin/execlineb -S0
s6-svscanctl -t /var/run/s6/services