Skip to content

Commit 62faea0

Browse files
support DOCKER deploy mode
1 parent 90ef04b commit 62faea0

File tree

2 files changed

+34
-4
lines changed

2 files changed

+34
-4
lines changed

lib/manager/components/deployment/DeploymentConfigurationsPanel.js

+32-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ import {
1010
ListGroupItem,
1111
Button,
1212
Panel,
13-
Glyphicon
13+
Glyphicon,
14+
Radio,
15+
FormGroup
1416
} from 'react-bootstrap'
1517
import Select from 'react-select'
1618
import validator from 'validator'
@@ -148,7 +150,11 @@ export default class DeploymentConfigurationsPanel extends Component<{
148150

149151
_onUpdateTripPlannerVersion = (option: ReactSelectOption) => {
150152
const {deployment, updateDeployment} = this.props
151-
updateDeployment(deployment, { tripPlannerVersion: option.value })
153+
updateDeployment(deployment, { tripPlannerVersion: option.value, deploymentMode: 'RUNNER' })
154+
}
155+
_onUpdateDeploymentMode = (e) => {
156+
const {deployment, updateDeployment} = this.props
157+
updateDeployment(deployment, { deploymentMode: e.target.value })
152158
}
153159

154160
_onUpdateVersion = (option: ReactSelectOption) => {
@@ -181,15 +187,37 @@ export default class DeploymentConfigurationsPanel extends Component<{
181187
options={TRIP_PLANNER_VERSIONS}
182188
value={deployment.tripPlannerVersion}
183189
/>
184-
<div>
190+
{deployment.tripPlannerVersion === 'OTP_2' && <>
191+
Deployment method
192+
<FormGroup>
193+
<Radio
194+
checked={deployment.deploymentMode === 'RUNNER'}
195+
name='RUNNER'
196+
value='RUNNER'
197+
onChange={this._onUpdateDeploymentMode}
198+
inline>
199+
OTP Runner
200+
</Radio>
201+
<Radio
202+
checked={deployment.deploymentMode === 'DOCKER'}
203+
name='DOCKER'
204+
value='DOCKER'
205+
onChange={this._onUpdateDeploymentMode}
206+
inline>
207+
Docker
208+
</Radio>
209+
</FormGroup>
210+
</>}
211+
{/** TODO: re-enable optional jar file selection once graph build is dockerized */}
212+
{<div> {/* deployment.deploymentMode !== 'DOCKER' && <div> */}
185213
OTP jar file
186214
<Select
187215
clearable={false}
188216
onChange={this._onUpdateVersion}
189217
options={options ? options.map(v => ({value: v, label: v})) : []}
190218
value={deployment.otpVersion}
191219
/>
192-
</div>
220+
</div>}
193221
</ListGroupItem>
194222
<ListGroupItem>
195223
Deploying to the{' '}

lib/types/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ export type Deployment = {
247247
dateCreated: number,
248248
deployJobSummaries: Array<DeploySummary>,
249249
deployedTo: ?string,
250+
deploymentMode: ?string,
251+
deploymentType: ?string,
250252
ec2Instances?: Array<EC2InstanceSummary>,
251253
feedSourceId: ?string,
252254
feedVersions: Array<SummarizedFeedVersion>,

0 commit comments

Comments
 (0)