diff --git a/backend/Dockerfile b/backend/Dockerfile index c591da21..7a1163d4 100755 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -15,8 +15,8 @@ RUN wget -O /app_sdk/app_base.py https://raw.githubusercontent.com/Shuffle/app_s ADD ./app_gen /app_gen RUN go get -v -RUN go mod tidy -RUN go clean -modcache +#RUN go mod tidy +#RUN go clean -modcache # From November 2022, CGO is enabled due to packages # that we use requiring it. This is a temporary fix diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index b9ee6c05..8ab7f06b 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -20,7 +20,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.6.94 + github.com/shuffle/shuffle-shared v0.7.0 golang.org/x/crypto v0.22.0 google.golang.org/api v0.176.1 google.golang.org/grpc v1.63.2 diff --git a/functions/onprem/orborus/Dockerfile b/functions/onprem/orborus/Dockerfile index 417bf568..4d0e0c6f 100644 --- a/functions/onprem/orborus/Dockerfile +++ b/functions/onprem/orborus/Dockerfile @@ -3,21 +3,14 @@ FROM golang:1.22 as builder WORKDIR /app # COPY go.* ./ -RUN go mod init orborus +COPY orborus.go /app/orborus.go +COPY go.mod /app/go.mod -RUN go get \ - github.com/docker/docker/api/types \ - github.com/docker/docker/api/types/container \ - github.com/mackerelio/go-osstat/cpu \ - github.com/mackerelio/go-osstat/memory \ - github.com/satori/go.uuid \ - github.com/shuffle/shuffle-shared \ - github.com/shirou/gopsutil +RUN go get -COPY orborus.go . - -RUN go mod tidy && \ - CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o orborus . +#RUN go mod tidy +RUN go build +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o orborus . FROM alpine:3.15.0 RUN apk add --no-cache bash tzdata @@ -26,4 +19,4 @@ ENV ENVIRONMENT_NAME=Shuffle \ BASE_URL=http://shuffle-backend:5001 \ DOCKER_API_VERSION=1.40 \ SHUFFLE_OPENSEARCH_URL=https://opensearch:9200 -CMD ["./orborus"] \ No newline at end of file +CMD ["./orborus"]