Fix duplicate erd version strings

yuzutech · May 31, 2024 · c0e7f8a · c0e7f8a
1 parent 6ba4d6f
commit c0e7f8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ci/tasks/update-versions.js b/ci/tasks/update-versions.js
@@ -149,7 +149,7 @@ try {
       const { version } = d2VersionFound.groups
       diagramLibraryVersions.d2 = version
     }
-    const erdVersionFound = line.match(/^ARG ERD_VERSION="(?<version>.+)"$/)
+    const erdVersionFound = line.match(/^FROM ghcr.io\/felixvanoost\/erd:v(?<version>\S+) AS erd$/)
     if (erdVersionFound) {
       const { version } = erdVersionFound.groups
       diagramLibraryVersions.erd = version

diff --git a/server/ops/docker/jdk17-jammy/Dockerfile b/server/ops/docker/jdk17-jammy/Dockerfile
@@ -202,8 +202,7 @@ RUN SVGBOB_VERSION=`cat Cargo.toml | grep "svgbob_cli =" | sed -r 's/.*"([^"]+)"
     cargo install --quiet --target $RUST_TARGET_ARCH-unknown-linux-gnu --version $SVGBOB_VERSION svgbob_cli
 
 ## Erd
-ARG ERD_VERSION="0.2.3"
-FROM ghcr.io/felixvanoost/erd:v$ERD_VERSION AS erd
+FROM ghcr.io/felixvanoost/erd:v0.2.3 AS erd
 
 ## yuzutech/kroki
 FROM eclipse-temurin:17.0.10_7-jre-jammy