ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 01:25:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

SQL Proj - Added an option to deploy to docker to select the base image (#17067)

Browse Source 
* Added an option to deploy to docker to select the base image
This commit is contained in:
Leila Lali
2021-09-14 13:49:57 -07:00
committed by GitHub
parent 95e82d53e6
commit 423cf8d3d5
5 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/sql-database-projects/src/models/deploy/deployProfile.ts
View File

@@ -1,3 +1,8 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { IDeploySettings } from '../IDeploySettings';
export enum AppSettingType {
@@ -21,4 +26,6 @@ export interface ILocalDbSetting {
userName: string,
password: string,
dbName: string,
dockerBaseImage: string,
connectionRetryTimeout?: number
}

15
extensions/sql-database-projects/src/models/deploy/deployService.ts
View File

@@ -20,6 +20,9 @@ export class DeployService {
constructor(private _outputChannel: vscode.OutputChannel) {
}
private DefaultSqlRetryTimeoutInSec: number = 10;
private DefaultSqlNumberOfRetries: number = 10;
private createConnectionStringTemplate(runtime: string | undefined): string {
switch (runtime?.toLocaleLowerCase()) {
case 'dotnet':
@@ -106,7 +109,7 @@ export class DeployService {
// Create commands
//
await this.createCommands(mssqlFolderPath, commandsFolderPath, dockerFilePath, startFilePath, imageLabel);
await this.createCommands(mssqlFolderPath, commandsFolderPath, dockerFilePath, startFilePath, imageLabel, profile.localDbSetting.dockerBaseImage);
this.logToOutput(constants.runningDockerMessage);
// Building the image and running the docker
@@ -144,7 +147,7 @@ export class DeployService {
private async buildAndRunDockerContainer(dockerFilePath: string, imageName: string, root: string, profile: ILocalDbSetting, imageLabel: string): Promise<string | undefined> {
this.logToOutput('Building docker image ...');
await utils.executeCommand(`docker pull ${constants.dockerBaseImage}`, this._outputChannel);
await utils.executeCommand(`docker pull ${profile.dockerBaseImage}`, this._outputChannel);
await utils.executeCommand(`docker build -f ${dockerFilePath} -t ${imageName} ${root}`, this._outputChannel);
await utils.executeCommand(`docker images --filter label=${imageLabel}`, this._outputChannel);
@@ -254,7 +257,7 @@ export class DeployService {
return connectionResult ? connectionResult.connectionId : <string>connection;
}
public async getConnection(profile: ILocalDbSetting, savePassword: boolean, database: string, timeoutInSeconds: number = 5): Promise<string | undefined> {
public async getConnection(profile: ILocalDbSetting, savePassword: boolean, database: string): Promise<string | undefined> {
const getAzdataApi = await utils.getAzdataApi();
let connection = await utils.retry(
constants.connectingToSqlServerOnDockerMessage,
@@ -264,7 +267,7 @@ export class DeployService {
this.validateConnection,
this.formatConnectionResult,
this._outputChannel,
5, timeoutInSeconds);
this.DefaultSqlNumberOfRetries, profile.connectionRetryTimeout || this.DefaultSqlRetryTimeoutInSec);
if (connection) {
const connectionResult = <ConnectionResult>connection;
@@ -311,7 +314,7 @@ export class DeployService {
}
// Creates command file and docker file needed for deploy operation
private async createCommands(mssqlFolderPath: string, commandsFolderPath: string, dockerFilePath: string, startFilePath: string, imageLabel: string): Promise<void> {
private async createCommands(mssqlFolderPath: string, commandsFolderPath: string, dockerFilePath: string, startFilePath: string, imageLabel: string, baseImage: string): Promise<void> {
// Create mssql folders if doesn't exist
//
await utils.createFolderIfNotExist(mssqlFolderPath);
@@ -328,7 +331,7 @@ export class DeployService {
//
await this.createFile(dockerFilePath,
`
FROM ${constants.dockerBaseImage}
FROM ${baseImage}
ENV ACCEPT_EULA=Y
ENV MSSQL_PID=Developer
LABEL ${imageLabel}