#105: Fix issue with snake-yaml causing conflicts

StefanVanDyck · StefanVanDyck · commit f62de10e3dca · 2024-12-19T09:07:20.000+01:00
diff --git a/docker/pipelines/Dockerfile b/docker/pipelines/Dockerfile
@@ -2,7 +2,7 @@ ARG BUILDPLATFORM=linux/amd64
 FROM --platform=${BUILDPLATFORM} custom-maven AS builder
 
 ARG VERSION=fixed-stuff
-ARG COMMIT=3b99dedb91cd8a9ed3b8dc0af3b6028d9d138e24
+ARG COMMIT=21cdd07e7732a4be533983fa22ff689f588bd8e8
 ARG SOURCE=https://github.com/StefanVanDyck/pipelines.git
 LABEL ala.version=inbo-${COMMIT}
 
@@ -28,7 +28,7 @@ RUN --mount=type=cache,target=/root/.m2/repository \
 #
 FROM openjdk:8
 
-ARG COMMIT=3b99dedb91cd8a9ed3b8dc0af3b6028d9d138e24
+ARG COMMIT=21cdd07e7732a4be533983fa22ff689f588bd8e8
 LABEL ala.version=inbo-${COMMIT}
 #
 # ARG VERSION=2.18.6-SNAPSHOT

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ ARG BUILDPLATFORM=linux/amd64`
`2`	`2`	`FROM --platform=${BUILDPLATFORM} custom-maven AS builder`
`3`	`3`
`4`	`4`	`ARG VERSION=fixed-stuff`
`5`		`-ARG COMMIT=3b99dedb91cd8a9ed3b8dc0af3b6028d9d138e24`
	`5`	`+ARG COMMIT=21cdd07e7732a4be533983fa22ff689f588bd8e8`
`6`	`6`	`ARG SOURCE=https://github.com/StefanVanDyck/pipelines.git`
`7`	`7`	`LABEL ala.version=inbo-${COMMIT}`
`8`	`8`
`@@ -28,7 +28,7 @@ RUN --mount=type=cache,target=/root/.m2/repository \`
`28`	`28`	`#`
`29`	`29`	`FROM openjdk:8`
`30`	`30`
`31`		`-ARG COMMIT=3b99dedb91cd8a9ed3b8dc0af3b6028d9d138e24`
	`31`	`+ARG COMMIT=21cdd07e7732a4be533983fa22ff689f588bd8e8`
`32`	`32`	`LABEL ala.version=inbo-${COMMIT}`
`33`	`33`	`#`
`34`	`34`	`# ARG VERSION=2.18.6-SNAPSHOT`