From bf0cceb33b2e687eabdb816ffa80d2749aec66cd Mon Sep 17 00:00:00 2001 From: xieguigang Date: Tue, 6 Jul 2021 15:11:34 +0800 Subject: [PATCH] docker run --- CloudKit/Docker/Commands.vb | 80 ++++++++++++++++++---------------- CloudKit/Docker/Docker.vbproj | 1 + CloudKit/Docker/Environment.vb | 4 +- 3 files changed, 46 insertions(+), 39 deletions(-) diff --git a/CloudKit/Docker/Commands.vb b/CloudKit/Docker/Commands.vb index d22a065..18d5fa3 100644 --- a/CloudKit/Docker/Commands.vb +++ b/CloudKit/Docker/Commands.vb @@ -1,43 +1,43 @@ #Region "Microsoft.VisualBasic::b8b59986a2c04e2f72184e70927a18c1, CloudKit\Docker\Commands.vb" - ' Author: - ' - ' asuka (amethyst.asuka@gcmodeller.org) - ' xie (genetics@smrucc.org) - ' xieguigang (xie.guigang@live.com) - ' - ' Copyright (c) 2018 GPL3 Licensed - ' - ' - ' GNU GENERAL PUBLIC LICENSE (GPL3) - ' - ' - ' This program is free software: you can redistribute it and/or modify - ' it under the terms of the GNU General Public License as published by - ' the Free Software Foundation, either version 3 of the License, or - ' (at your option) any later version. - ' - ' This program is distributed in the hope that it will be useful, - ' but WITHOUT ANY WARRANTY; without even the implied warranty of - ' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ' GNU General Public License for more details. - ' - ' You should have received a copy of the GNU General Public License - ' along with this program. If not, see . - - - - ' /********************************************************************************/ - - ' Summaries: - - ' Module Commands - ' - ' Function: CommandHistory, PS, rmi, Run, Search - ' - ' Sub: [Stop] - ' - ' /********************************************************************************/ +' Author: +' +' asuka (amethyst.asuka@gcmodeller.org) +' xie (genetics@smrucc.org) +' xieguigang (xie.guigang@live.com) +' +' Copyright (c) 2018 GPL3 Licensed +' +' +' GNU GENERAL PUBLIC LICENSE (GPL3) +' +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + + + +' /********************************************************************************/ + +' Summaries: + +' Module Commands +' +' Function: CommandHistory, PS, rmi, Run, Search +' +' Sub: [Stop] +' +' /********************************************************************************/ #End Region @@ -217,7 +217,11 @@ Public Module Commands .Mount(mounts) _ .CreateDockerCommand(command, workdir, portForward) +#If UNIX = 0 Then + Return CommandLine.Call("docker", cli.GetTagValue.Value) +#Else Return powershell(cli) +#End If End Function ''' diff --git a/CloudKit/Docker/Docker.vbproj b/CloudKit/Docker/Docker.vbproj index 2eeaa10..7c64a61 100644 --- a/CloudKit/Docker/Docker.vbproj +++ b/CloudKit/Docker/Docker.vbproj @@ -24,6 +24,7 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 + UNIX=0 pdbonly diff --git a/CloudKit/Docker/Environment.vb b/CloudKit/Docker/Environment.vb index 05aa55d..533d54a 100644 --- a/CloudKit/Docker/Environment.vb +++ b/CloudKit/Docker/Environment.vb @@ -227,7 +227,9 @@ Public Class Environment ''' ``app arguments`` ''' Working directory inside the container ''' Publish a container's port(s) to the host - ''' + ''' + ''' docker run xxx + ''' Public Function CreateDockerCommand(command$, Optional workdir$ = Nothing, Optional portForward As PortForward = Nothing) As String Dim options As New StringBuilder