[FIX] wrong image in docker-compose.yaml

This commit is contained in:
huangrh 2019-03-27 16:04:50 +08:00
parent 9d47fae53e
commit d730e3506a
2 changed files with 9 additions and 6 deletions

View File

@ -1,6 +1,7 @@
package controller
import (
"encoding/json"
"fmt"
"net/http"
@ -34,6 +35,8 @@ func (a *AppStruct) ExportApp(w http.ResponseWriter, r *http.Request) {
if !ok {
return
}
b, _ := json.Marshal(&tr)
logrus.Debugf("request uri: %s; request body: %s", r.RequestURI, string(b))
if err := handler.GetAppHandler().Complete(&tr); err != nil {
return

View File

@ -19,16 +19,14 @@
package exector
import (
"time"
"fmt"
"io/ioutil"
"os"
"os/exec"
"regexp"
"strconv"
"strings"
"regexp"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/client"
@ -526,6 +524,7 @@ func (i *ExportApp) buildDockerComposeYaml() error {
for _, app := range apps {
image := app.Get("image").String()
shareImage := app.Get("share_image").String()
appName := app.Get("service_cname").String()
appName = unicode2zh(appName)
volumes := make([]string, 0, 3)
@ -543,8 +542,9 @@ func (i *ExportApp) buildDockerComposeYaml() error {
volumes = append(volumes, fmt.Sprintf("%s:%s", volumeName, volumePath))
}
lang := app.Get("language").String()
// 如果该组件是源码方式部署则挂载slug文件到runner容器内
if checkIsRunner(image) {
if lang != "dockerfile" && checkIsRunner(image) {
shareSlugPath := app.Get("share_slug_path").String()
tarFileName := buildToLinuxFileName(shareSlugPath)
volume := fmt.Sprintf("__GROUP_DIR__/%s/%s:/tmp/slug/slug.tgz", appName, tarFileName)
@ -580,7 +580,7 @@ func (i *ExportApp) buildDockerComposeYaml() error {
}
service := &Service{
Image: image,
Image: shareImage,
ContainerName: appName,
Restart: "always",
NetworkMode: "host",