sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix docker image field being required for inheritance, closes #413

This commit is contained in:
Dane Everitt 2017-05-01 16:51:50 -04:00
parent c9c0e845b1
commit 5545075302
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* It is now possible to modify a server's disk limits after the server is created. * It is now possible to modify a server's disk limits after the server is created.
* `[beta.2.1]` — Fixes a bug causing login issues and password reset failures when reCAPTCHA is enabled. * `[beta.2.1]` — Fixes a bug causing login issues and password reset failures when reCAPTCHA is enabled.
* Fixes remote timing attack vulnerability due to hmac comparsion in API middleware. * Fixes remote timing attack vulnerability due to hmac comparsion in API middleware.
* `[beta.2.1]` — Fixes bug requiring docker image field to be filled out when adding a service option.
### Added ### Added
* Added new scripts for service options that allows installation of software in a privileged Docker container on the node prior to marking a server as installed. * Added new scripts for service options that allows installation of software in a privileged Docker container on the node prior to marking a server as installed.

2
app/Repositories/OptionRepository.php
View File

@ -48,7 +48,7 @@ class OptionRepository
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'description' => 'required|string', 'description' => 'required|string',
'tag' => 'required|string|max:255|unique:service_options,tag', 'tag' => 'required|string|max:255|unique:service_options,tag',
'docker_image' => 'required|string|max:255', 'docker_image' => 'sometimes|string|max:255',
'startup' => 'sometimes|nullable|string', 'startup' => 'sometimes|nullable|string',
'config_from' => 'sometimes|required|numeric|exists:service_options,id', 'config_from' => 'sometimes|required|numeric|exists:service_options,id',
'config_startup' => 'required_without:config_from|json', 'config_startup' => 'required_without:config_from|json',