Disable update for docker containers (#715)

Also add docker info to about page and sentry context
This commit is contained in:
ta264
2019-04-05 16:47:26 +01:00
committed by GitHub
parent 6afece237c
commit 4be01a5a95
13 changed files with 101 additions and 30 deletions

View File

@@ -98,6 +98,7 @@ class GeneralSettings extends Component {
isResettingApiKey,
isMono,
isWindows,
isDocker,
mode,
onInputChange,
onConfirmResetApiKey,
@@ -161,6 +162,7 @@ class GeneralSettings extends Component {
advancedSettings={advancedSettings}
settings={settings}
isMono={isMono}
isDocker={isDocker}
onInputChange={onInputChange}
/>
@@ -202,6 +204,7 @@ GeneralSettings.propTypes = {
hasSettings: PropTypes.bool.isRequired,
isMono: PropTypes.bool.isRequired,
isWindows: PropTypes.bool.isRequired,
isDocker: PropTypes.bool.isRequired,
mode: PropTypes.string.isRequired,
onInputChange: PropTypes.func.isRequired,
onConfirmResetApiKey: PropTypes.func.isRequired,

View File

@@ -26,6 +26,7 @@ function createMapStateToProps() {
isResettingApiKey,
isMono: systemStatus.isMono,
isWindows: systemStatus.isWindows,
isDocker: systemStatus.isDocker,
mode: systemStatus.mode,
...sectionSettings
};

View File

@@ -16,6 +16,7 @@ function UpdateSettings(props) {
advancedSettings,
settings,
isMono,
isDocker,
onInputChange
} = props;
@@ -35,6 +36,14 @@ function UpdateSettings(props) {
{ key: 'script', value: 'Script' }
];
if (isDocker) {
return (
<FieldSet legend="Updates">
<div>Updating is disabled inside a docker container. Update the container image instead.</div>
</FieldSet>
);
}
return (
<FieldSet legend="Updates">
<FormGroup
@@ -117,6 +126,7 @@ UpdateSettings.propTypes = {
advancedSettings: PropTypes.bool.isRequired,
settings: PropTypes.object.isRequired,
isMono: PropTypes.bool.isRequired,
isDocker: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired
};