Merge pull request #1820 from Shuffle/main

Syncing new fixes in main back to nightly

backend/Dockerfile

@@ -20,7 +20,7 @@ RUN go mod tidy
 # From November 2022, CGO is enabled due to packages
 # that we use requiring it. This is a temporary fix
 # and makes us HAVE to install libc compatibility packages farther down.
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o webapp .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o shufflebackend .
 
 # Certificate build - gets required certs
 FROM alpine:latest as certs
@@ -40,4 +40,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica
 
 WORKDIR /app
 EXPOSE 5001
-CMD ["./webapp"]
+CMD ["./shufflebackend"]

backend/app_gen/python-lib/baseline/Dockerfile

@@ -1,26 +1,26 @@
-# Base our app image off of the WALKOFF App SDK image
 FROM frikky/shuffle:app_sdk as base
 
 # We're going to stage away all of the bloat from the build tools so lets create a builder stage
 FROM base as builder
 
 # Install all alpine build tools needed for our pip installs
-RUN apk --no-cache add --update alpine-sdk libffi libffi-dev musl-dev openssl-dev 
+RUN apk --no-cache add --update alpine-sdk libffi libffi-dev musl-dev openssl-dev git
 
 # Install all of our pip packages in a single directory that we can copy to our base image later
 RUN mkdir /install
 WORKDIR /install
 COPY requirements.txt /requirements.txt
-RUN pip install --prefix="/install" -r /requirements.txt
+RUN pip install --no-cache-dir --upgrade --prefix="/install" -r /requirements.txt
 
 # Switch back to our base image and copy in all of our built packages and source code
 FROM base
 COPY --from=builder /install /usr/local
 COPY src /app
 
-# Install any binary dependencies needed in our final image - this can be a lot of different stuff
-RUN apk --no-cache add --update libmagic
+# Install any binary dependencies needed in our final image
+# RUN apk --no-cache add --update my_binary_dependency
+RUN apk --no-cache add jq git curl
 
 # Finally, lets run our app!
 WORKDIR /app
-CMD python app.py --log-level DEBUG
+CMD ["python", "app.py", "--log-level", "DEBUG"]

backend/go-app/go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/h2non/filetype v1.1.3
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.9.16
+	github.com/shuffle/shuffle-shared v0.9.25
 	github.com/shuffle/singul v0.0.16
 	golang.org/x/crypto v0.40.0
 	google.golang.org/api v0.236.0

backend/go-app/go.sum

@@ -363,8 +363,8 @@ github.com/sendgrid/sendgrid-go v3.16.1+incompatible h1:zWhTmB0Y8XCDzeWIm2/BIt1G
 github.com/sendgrid/sendgrid-go v3.16.1+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/shuffle/shuffle-shared v0.9.16 h1:B3Dp3h2f62JdWmqQ1kTu7DwJY6HCOMrxxSojAeuhI9k=
-github.com/shuffle/shuffle-shared v0.9.16/go.mod h1:PhDEizuz4SmJaSmy0+yrFWwD1mXVUsy8/knKlrqF1qw=
+github.com/shuffle/shuffle-shared v0.9.21 h1:ZxA/g0Lk93miHJpVYAhtTQmtWLJWcCtm6kFNF772Ynk=
+github.com/shuffle/shuffle-shared v0.9.21/go.mod h1:PhDEizuz4SmJaSmy0+yrFWwD1mXVUsy8/knKlrqF1qw=
 github.com/shuffle/singul v0.0.16 h1:dW+0Mln9R1aUJ0fjikpWcxbjoQWqJHxe4kSxh2tQN5E=
 github.com/shuffle/singul v0.0.16/go.mod h1:LYkp320A6gsoPlYbXUM+WvEPUVAuutlSsqnVKyRy4gs=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=

backend/go-app/main.go

@@ -3335,10 +3335,15 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User, s
 	// Read and copy the baseline Dockerfile
 	dockerfileContent, err := ioutil.ReadFile(dockerfileSource)
 	if err != nil {
-		log.Printf("[ERROR] Failed to read baseline Dockerfile: %s", err)
-		resp.WriteHeader(500)
-		resp.Write([]byte(`{"success": false, "reason": "Failed to read baseline Dockerfile"}`))
-		return
+		foundDockerfile := shuffle.GetBaseDockerfile() 
+		if len(foundDockerfile) > 0 {
+			dockerfileContent = foundDockerfile
+		} else {
+			log.Printf("[ERROR] Failed to read baseline Dockerfile: %s", err)
+			resp.WriteHeader(500)
+			resp.Write([]byte(`{"success": false, "reason": "Failed to read baseline Dockerfile"}`))
+			return
+		}
 	}
 
 	err = ioutil.WriteFile(dockerfileDestination, dockerfileContent, 0644)