Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WX-1807 Modernize Docker build #338

Merged
merged 3 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# Production build/deploy/start of DSDE Methods Repository Webservice

# http://github.com/broadinstitute/scala-baseimage
# TODO: adopt `sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.22_7_1.9.9_2.13.13`
# Currently using the very outdated http://github.com/broadinstitute/scala-baseimage
# because the Docker version on Jenkins is obsolete and does not support recent images.
FROM broadinstitute/scala-baseimage as builder

# Install Agora
ADD . /agora
RUN ["/bin/bash", "-c", "/agora/docker/install.sh /agora"]

FROM adoptopenjdk:11-hotspot
FROM us.gcr.io/broad-dsp-gcr-public/base/jre:11-debian

# Expose the port used by Agora webservice
EXPOSE 8000
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name := "Agora"

organization := "org.broadinstitute"

scalaVersion := "2.13.9"
scalaVersion := "2.13.13"

// Ported from Cromwell 2019-11-19
// The disabled ones are not too crazy to get compliant with, but more work than I want to do just now (AEN)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package org.broadinstitute.dsde.agora
import org.broadinstitute.dsde.workbench.model.ErrorReportSource

package object server {
implicit val errorReportSource = ErrorReportSource("agora")
implicit val errorReportSource: ErrorReportSource = ErrorReportSource("agora")
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.broadinstitute.dsde.agora.server.webservice.util

import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
import spray.json.DefaultJsonProtocol
import spray.json.{DefaultJsonProtocol, RootJsonFormat}

object DockerHubJsonSupport extends DefaultJsonProtocol with SprayJsonSupport {
implicit val DockerTagInfoFormat = jsonFormat2(DockerTagInfo)
implicit val DockerTagInfoFormat: RootJsonFormat[DockerTagInfo] = jsonFormat2(DockerTagInfo)
}
Loading