From 229d38fd73a2c633842871bac9b6a36ce15bfe73 Mon Sep 17 00:00:00 2001 From: frikky Date: Mon, 19 Jul 2021 01:22:54 +0200 Subject: [PATCH] Cleaned up for minor release --- backend/go-app/docker.go | 8 ++++---- backend/go-app/go.mod | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/go-app/docker.go b/backend/go-app/docker.go index cf260598..069a88e6 100644 --- a/backend/go-app/docker.go +++ b/backend/go-app/docker.go @@ -260,15 +260,15 @@ func buildImageMemory(fs billy.Filesystem, tags []string, dockerfileFolder strin //log.Printf("RESPONSE: %#v", imageBuildResponse) //log.Printf("Response: %#v", imageBuildResponse.Body) - //log.Printf("IMAGERESPONSE: %#v", imageBuildResponse.Body) + log.Printf("[DEBUG] IMAGERESPONSE: %#v", imageBuildResponse.Body) - defer imageBuildResponse.Body.Close() + //defer imageBuildResponse.Body.Close() buildBuf := new(strings.Builder) _, newerr := io.Copy(buildBuf, imageBuildResponse.Body) if newerr != nil { - log.Printf("Failed reading Docker build STDOUT: %s", newerr) + log.Printf("[WARNING] Failed reading Docker build STDOUT: %s", newerr) } else { - log.Printf("STRING: %s", buildBuf.String()) + log.Printf("[INFO] STRING: %s", buildBuf.String()) if strings.Contains(buildBuf.String(), "errorDetail") { log.Printf("[ERROR] Docker build:\n%s\nERROR ABOVE: Trying to pull tags from: %s", buildBuf.String(), strings.Join(tags, "\n")) diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 410cf847..21ea23af 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -2,7 +2,7 @@ module shuffle go 1.13 -replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared +//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi @@ -22,7 +22,7 @@ require ( github.com/docker/go-units v0.4.0 // indirect github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect github.com/frikky/kin-openapi v0.39.0 - github.com/frikky/shuffle-shared v0.0.71 + github.com/frikky/shuffle-shared v0.0.72 github.com/fsouza/go-dockerclient v1.7.2 github.com/ghodss/yaml v1.0.0 github.com/go-git/go-billy/v5 v5.0.0 diff --git a/docker-compose.yml b/docker-compose.yml index 26dfad03..78e6ae61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: depends_on: - backend backend: - build: ./backend + #build: ./backend image: ghcr.io/frikky/shuffle-backend:nightly container_name: shuffle-backend hostname: ${BACKEND_HOSTNAME}