Skip to content

Commit

Permalink
Merge pull request #14 from NBISweden/hot-fix/ingress
Browse files Browse the repository at this point in the history
Docker build fix
  • Loading branch information
darthvader2 authored Apr 17, 2024
2 parents 638c619 + ee4cf32 commit a5b7b16
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
web/content/datasets/*
dev_utils/*
nginx_proxy/*
charts/
dev_utils/
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ WORKDIR /lp_app
COPY . .
ENV GO111MODULE=on
ENV CGO_ENABLED=0
RUN go build -o test .
RUN go build -o app .

FROM alpine:3.17

WORKDIR /gen_app
RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community hugo
COPY --from=build /lp_app/test /gen_app
COPY dev_utils .

CMD ["./test"]
COPY --from=build /lp_app/app .
COPY --from=build /lp_app/web web/
CMD ["./app"]
11 changes: 7 additions & 4 deletions download_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@ func metadataDownloader(Metadataclient *MetadataBackend) {
log.Fatalln("error:", err)
}
for _, obj := range page.Contents {
if err := downloadToFile(manager, LocalDirectory, Bucket, aws.ToString(obj.Key)); err != nil {
log.Fatalf("Error while getting next page from ListObjectsV2Paginator: %v", err)
err := downloadToFile(manager, LocalDirectory, Bucket, aws.ToString(obj.Key))
if err != nil {
log.Fatal("Error while downloading metadata files from metadata bucket", err)
} else {
log.Infoln("Completed downloading metadatafiles")

}
}

}
log.Infoln("Completed downloading metadatafiles")

}

Expand All @@ -52,7 +55,7 @@ func downloadToFile(downloader *manager.Downloader, targetDirectory, bucket, key
// Set up the local file
fd, err := os.Create(file)
if err != nil {
return err
log.Fatal("Error while writing XML files to folder", err)
}
defer fd.Close()
// Download the file using the AWS SDK for Go
Expand Down

0 comments on commit a5b7b16

Please sign in to comment.