Skip to content

Commit

Permalink
updating changelogs
Browse files Browse the repository at this point in the history
  • Loading branch information
lucymcnatt committed Apr 23, 2024
1 parent 4914ecf commit d5425ba
Show file tree
Hide file tree
Showing 16 changed files with 265 additions and 8 deletions.
1 change: 1 addition & 0 deletions .scala-build/.bloop/terra-docker_bd2c96d2de-test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":"1.4.0","project":{"name":"terra-docker_bd2c96d2de-test","directory":"/Users/mcnatt/broad/terra-docker/.scala-build","workspaceDir":"/Users/mcnatt/broad/terra-docker","sources":[],"dependencies":["terra-docker_bd2c96d2de"],"classpath":["/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10.jar","/Users/mcnatt/broad/terra-docker/.scala-build/terra-docker_bd2c96d2de/classes/main","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/sourcegraph/semanticdb-javac/0.7.4/semanticdb-javac-0.7.4.jar"],"out":"/Users/mcnatt/broad/terra-docker/.scala-build/.bloop/terra-docker_bd2c96d2de-test","classesDir":"/Users/mcnatt/broad/terra-docker/.scala-build/terra-docker_bd2c96d2de/classes/test","scala":{"organization":"org.scala-lang","name":"scala-compiler","version":"3.3.0","options":["-Xsemanticdb","-sourceroot","/Users/mcnatt/broad/terra-docker","-release","17"],"jars":["/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.0/scala3-compiler_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.3.0/scala3-interfaces-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.3.0/tasty-core_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/9.4.0-scala-1/scala-asm-9.4.0-scala-1.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-sbt/compiler-interface/1.3.5/compiler-interface-1.3.5.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-reader/3.19.0/jline-reader-3.19.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal/3.19.0/jline-terminal-3.19.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal-jna/3.19.0/jline-terminal-jna-3.19.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.7.0/protobuf-java-3.7.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-sbt/util-interface/1.3.0/util-interface-1.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/net/java/dev/jna/jna/5.3.1/jna-5.3.1.jar"]},"java":{"options":["--release","17","-Xplugin:semanticdb -sourceroot:/Users/mcnatt/broad/terra-docker -targetroot:javac-classes-directory","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"]},"test":{"frameworks":[{"names":["com.novocode.junit.JUnitFramework"]},{"names":["org.scalatest.tools.Framework","org.scalatest.tools.ScalaTestFramework"]},{"names":["org.scalacheck.ScalaCheckFramework"]},{"names":["org.specs.runner.SpecsFramework","org.specs2.runner.Specs2Framework","org.specs2.runner.SpecsFramework"]},{"names":["utest.runner.Framework"]},{"names":["munit.Framework"]}],"options":{"excludes":[],"arguments":[]}},"platform":{"name":"jvm","config":{"options":[]},"mainClass":[]},"resolution":{"modules":[{"organization":"org.scala-lang","name":"scala3-library_3","version":"3.3.0","artifacts":[{"name":"scala3-library_3","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0.jar"},{"name":"scala3-library_3","classifier":"sources","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0-sources.jar"}]},{"organization":"org.scala-lang","name":"scala-library","version":"2.13.10","artifacts":[{"name":"scala-library","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10.jar"},{"name":"scala-library","classifier":"sources","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10-sources.jar"}]}]},"tags":["test"]}}
1 change: 1 addition & 0 deletions .scala-build/.bloop/terra-docker_bd2c96d2de.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":"1.4.0","project":{"name":"terra-docker_bd2c96d2de","directory":"/Users/mcnatt/broad/terra-docker/.scala-build","workspaceDir":"/Users/mcnatt/broad/terra-docker","sources":["/Users/mcnatt/broad/terra-docker/.scala-build/terra-docker_bd2c96d2de/src_generated/main/updateVersions.scala"],"dependencies":[],"classpath":["/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/sourcegraph/semanticdb-javac/0.7.4/semanticdb-javac-0.7.4.jar"],"out":"/Users/mcnatt/broad/terra-docker/.scala-build/.bloop/terra-docker_bd2c96d2de","classesDir":"/Users/mcnatt/broad/terra-docker/.scala-build/terra-docker_bd2c96d2de/classes/main","scala":{"organization":"org.scala-lang","name":"scala-compiler","version":"3.3.0","options":["-Xsemanticdb","-sourceroot","/Users/mcnatt/broad/terra-docker","-release","17"],"jars":["/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.0/scala3-compiler_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.3.0/scala3-interfaces-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.3.0/tasty-core_3-3.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/9.4.0-scala-1/scala-asm-9.4.0-scala-1.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-sbt/compiler-interface/1.3.5/compiler-interface-1.3.5.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-reader/3.19.0/jline-reader-3.19.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal/3.19.0/jline-terminal-3.19.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal-jna/3.19.0/jline-terminal-jna-3.19.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.7.0/protobuf-java-3.7.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-sbt/util-interface/1.3.0/util-interface-1.3.0.jar","/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/net/java/dev/jna/jna/5.3.1/jna-5.3.1.jar"]},"java":{"options":["--release","17","-Xplugin:semanticdb -sourceroot:/Users/mcnatt/broad/terra-docker -targetroot:javac-classes-directory","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED","-J--add-exports","-Jjdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"]},"platform":{"name":"jvm","config":{"options":[]},"mainClass":[]},"resolution":{"modules":[{"organization":"org.scala-lang","name":"scala3-library_3","version":"3.3.0","artifacts":[{"name":"scala3-library_3","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0.jar"},{"name":"scala3-library_3","classifier":"sources","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.3.0/scala3-library_3-3.3.0-sources.jar"}]},{"organization":"org.scala-lang","name":"scala-library","version":"2.13.10","artifacts":[{"name":"scala-library","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10.jar"},{"name":"scala-library","classifier":"sources","path":"/Users/mcnatt/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10-sources.jar"}]}]},"tags":["library"]}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@




final class updateVersions$_ {
def args = updateVersions_sc.args$
def scriptPath = """updateVersions.sc"""
/*<script>*/
/**
* This script is written in Scala 2.13+
* Run it with `ammonite for Scala 2.13+`
*/

val workbenchUtil2 = "0.10-c3ef6b80-SNAP"

val circeVersion = "0.14.0"
interp.load.ivy(
"co.fs2" %% "fs2-io" % "2.5.10",
"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-parser" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion,
"io.circe" %% "circe-optics" % circeVersion
)

@

import cats.effect.IO
import java.nio.file.Paths
import java.nio.file.Path

import io.circe.parser._
import io.circe.Printer
import io.circe.Json
import io.circe.syntax._
import io.circe.optics.JsonPath._
import io.circe.generic.semiauto._
import sys.process._
import scala.concurrent.ExecutionContext.global
import cats.effect.Blocker
import fs2.{io, text}
import java.time.Instant
import cats.implicits._

implicit val cs = IO.contextShift(global)
val blocker = Blocker.liftExecutionContext(global)

// Example: oldVersion 1.0.4, newVersion 1.0.5
private def newVersion(oldVersion: String, bumpMajorVersion: Boolean): String = {
val splited = oldVersion.split("\\.")
if(bumpMajorVersion)
s"${splited(0).toInt + 1}.0.0"
else
s"${splited(0)}.${splited(1)}.${splited(2).toInt + 1}"
}

def modifyVersion(bumpMajorVersion: Boolean): Json => Json =
root.version.string.modify {
s =>
newVersion(s, bumpMajorVersion)
}

def modifyImageData(imagesToUpdate: List[String], bumpMajorVersion: Boolean): Json => Json =
root.image_data.arr.modify {
listOfImageData =>
listOfImageData.map {
image =>
val imageName = image.hcursor.downField("name").as[String].fold(e => throw e, identity)
if(imagesToUpdate.contains(imageName))
modifyVersion(bumpMajorVersion)(image)
else image
}
}

/**
* In repo root dir, run `amm ./updateVersions.sc terra-jupyter-base 'update notebook to 6.1.1'`
* @param updatedImage e.g. "terra-jupyter-base"
*/
@main
def main(updatedImage: String, updatedImageReleaseNote: String, bumpMajorVersion: Boolean = false): Unit = {
val imagesToUpdate: List[String] = updatedImage match {
case "terra-jupyter-base" => List(
"terra-jupyter-bioconductor",
"terra-jupyter-hail",
"terra-jupyter-base",
"terra-jupyter-python",
"terra-jupyter-r",
"terra-jupyter-gatk",
"terra-jupyter-aou",
)
case "terra-jupyter-r" => List(
"terra-jupyter-r",
"terra-jupyter-bioconductor",
"terra-jupyter-gatk",
"terra-jupyter-aou",
)
case "terra-jupyter-python" => List(
"terra-jupyter-python",
"terra-jupyter-hail",
"terra-jupyter-gatk",
"terra-jupyter-aou",
)
case "terra-jupyter-hail" => List(
"terra-jupyter-hail"
)
case "terra-jupyter-gatk" => List(
"terra-jupyter-gatk"
)
case "terra-jupyter-aou" => List(
"terra-jupyter-aou"
)
case updatedImage =>
throw new Exception(s"${updatedImage} is not supported yet. Please update the script to support the image")
}

val res = for {
configFileRawJson <- (io.file.readAll[IO](Paths.get("./config/conf.json"), blocker, 4096).through(text.utf8Decode)).compile.string
config <- IO.fromEither(parse(configFileRawJson))
newConfig = modifyImageData(imagesToUpdate, bumpMajorVersion)(config)
_ <- (fs2.Stream.emit(newConfig.asJson.printWith(Printer.spaces4)).covary[IO]
.through(text.utf8Encode)
.through(io.file.writeAll(Paths.get("./config/conf.json"), blocker))).compile.drain

// Update updatedImage's changelog
updatedImageChangeLogFile = Paths.get(s"${updatedImage}/CHANGELOG.md")
updatedImageNewVersion <- updateChangeLogFile(
updatedImage,
s"""- ${updatedImageReleaseNote}""".stripMargin,
updatedImageChangeLogFile,
bumpMajorVersion
)
// Update `Dockerfile` and `CHANGELOG.md`
_ <- imagesToUpdate.filterNot(_.contains(updatedImage)).traverse {
image =>
val dockerFileToUpdate = Paths.get(s"${image}/Dockerfile")
val changelogFile = Paths.get(s"./${image}/CHANGELOG.md")
for {
lines <- (io.file.readAll[IO] (dockerFileToUpdate, blocker, 4096)
.through(text.utf8Decode)
.through(text.lines)).compile.toList
newLines = lines.zipWithIndex.map {
lineWithIndex =>
val s = lineWithIndex._1
if(s.contains("FROM") && !s.contains("AS")) {
val firstSplit = s.split(":")
val imageName = firstSplit(0).split("\\/")(2)
if(imagesToUpdate.contains(imageName)) {
s"${firstSplit(0)}:${newVersion(firstSplit(1), bumpMajorVersion)}\n"
} else s"${s}\n"
} else if(s.contains(" AS ") && imagesToUpdate.contains("terra-jupyter-python")) {
val firstSplit = s.split(":")
val secondSplit = firstSplit(1).split(" ")
s"${firstSplit(0)}:${newVersion(secondSplit(0), bumpMajorVersion)} AS python\n"
} else if(lineWithIndex._2 == lines.length - 1)
s
else s"${s}\n"
}
_ <- (fs2.Stream.emits(newLines).covary[IO].through(text.utf8Encode)
.through(io.file.writeAll(dockerFileToUpdate, blocker))).compile.drain

_ <- updateChangeLogFile(image, s"- Update `${updatedImage}` to `${updatedImageNewVersion}`\n - ${updatedImageReleaseNote}", changelogFile, bumpMajorVersion)
} yield ()
}
} yield ()

res.unsafeRunSync
}

// returns the new version String of this file
def updateChangeLogFile(image: String, msg: String, path: Path, bumpMajorVersion: Boolean): IO[String] = for {
originalFileContent <- (io.file.readAll[IO] (path, blocker, 4096)
.through(text.utf8Decode)).compile.string
firstLine = originalFileContent.split("\n")(0)
newV = newVersion(firstLine.split(" ")(1), bumpMajorVersion)
newFileContent =
s"""## ${newV} - ${Instant.now()}
|
|${msg}
|
|Image URL: `us.gcr.io/broad-dsp-gcr-public/${image}:${newV}`
|
|${originalFileContent}""".stripMargin
_ <- (fs2.Stream.emit(newFileContent).covary[IO].through(text.utf8Encode)
.through(io.file.writeAll(path, blocker))).compile.drain
} yield newV

/*</script>*/ /*<generated>*/
/*</generated>*/
}

object updateVersions_sc {
private var args$opt0 = Option.empty[Array[String]]
def args$set(args: Array[String]): Unit = {
args$opt0 = Some(args)
}
def args$opt: Option[Array[String]] = args$opt0
def args$: Array[String] = args$opt.getOrElse {
sys.error("No arguments passed to this script")
}

lazy val script = new updateVersions$_

def main(args: Array[String]): Unit = {
args$set(args)
script.hashCode() // hashCode to clear scalac warning about pure expression in statement position
}
}

export updateVersions_sc.script as updateVersions

9 changes: 9 additions & 0 deletions terra-jupyter-aou/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## 2.2.8 - 2022-04-23
- Update `terra-jupyter-gatk` to `2.3.5`
- Update `terra-jupyter-r` to `2.2.4`
- Update `terra-jupyter-python` to `1.1.5`
- Update `terra-jupyter-base` to `1.1.4`
- Change the welder user id

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.8`

## 2.2.7 - 2023-11-01
- Pin `gnomad` to `0.6.4`
- See https://github.com/broadinstitute/gnomad_methods/releases for details
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-aou/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.4
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.5

USER root

Expand Down
5 changes: 5 additions & 0 deletions terra-jupyter-base/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.1.4 - 2024-4-23
- Change the welder user id

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.4`

## 1.1.3 - 2023-10-03
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

Expand Down
7 changes: 7 additions & 0 deletions terra-jupyter-bioconductor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.2.4 - 2024-04-23
- Update `terra-jupyter-r` to `2.2.4`
- Update `terra-jupyter-base` to `1.1.4`
- Change welder user id

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.4`

## 2.2.3 - 2023-10-03
- Update `terra-jupyter-r` to `2.2.3`
- Update `terra-jupyter-base` to `1.1.3`
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-bioconductor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4
6 changes: 6 additions & 0 deletions terra-jupyter-gatk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.3.5 - 2024-04-23
- Update `terra-jupyter-r` to `2.2.4`
- Update `terra-jupyter-python` to `1.1.5`
- Update `terra-jupyter-base` to `1.1.4`
- Change the welder user id

## 2.3.4 - 2023-10-06
- Update `terra-jupyter-python` to `1.1.4`
- Downgrade pytz to `2023.3`
Expand Down
4 changes: 2 additions & 2 deletions terra-jupyter-gatk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.4 AS python
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5 AS python

FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4

USER root

Expand Down
7 changes: 7 additions & 0 deletions terra-jupyter-hail/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.1.8 - 2024-04-23
- Update `terra-jupyter-python` to `1.1.5`
- Update `terra-jupyter-base` to `1.1.4`
- Change the welder user id

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.8`

## 1.1.7 - 2023-11-01
- Pin `gnomad` to `0.6.4`
- See https://github.com/broadinstitute/gnomad_methods/releases for details
Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-hail/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.4
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5

USER root

Expand Down
6 changes: 6 additions & 0 deletions terra-jupyter-python/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.1.5 - 2024-04-23
- Update `terra-jupyter-base` to `1.1.4`
- Change the welder user id

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5`

## 1.1.4 - 2023-10-06
- Downgrade pytz to `2023.3`

Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.4

USER root
# This makes it so pip runs as root, not the user.
Expand Down
8 changes: 7 additions & 1 deletion terra-jupyter-r/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
## 1.1.3 - 2023-10-03
## 2.2.4 - 2024-04-23
- Update `terra-jupyter-base` to `1.1.4`
- Change the welder user id

Image URL: `us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4`

## 2.2.3 - 2023-10-03
- Update `terra-jupyter-base` to `1.1.3`
- Downgrade notebook to `6.5.4` and jupyterlab-server to `2.23.0`

Expand Down
2 changes: 1 addition & 1 deletion terra-jupyter-r/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3
FROM us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.4

USER root

Expand Down

0 comments on commit d5425ba

Please sign in to comment.