From 5545075302d667867380dcbed64dfd026205f799 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 1 May 2017 16:51:50 -0400 Subject: [PATCH] Fix docker image field being required for inheritance, closes #413 --- CHANGELOG.md | 1 + app/Repositories/OptionRepository.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61f9023b7..f75fffac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. * `[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. +* `[beta.2.1]` — Fixes bug requiring docker image field to be filled out when adding a service option. ### 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. diff --git a/app/Repositories/OptionRepository.php b/app/Repositories/OptionRepository.php index 346a452c8..fc887dd53 100644 --- a/app/Repositories/OptionRepository.php +++ b/app/Repositories/OptionRepository.php @@ -48,7 +48,7 @@ class OptionRepository 'name' => 'required|string|max:255', 'description' => 'required|string', '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', 'config_from' => 'sometimes|required|numeric|exists:service_options,id', 'config_startup' => 'required_without:config_from|json',