CI(deps): Update docker/dockerfile:1.11 Docker digest to 10c699f (OSG…

…eo#4669)
a0x8o · Nov 11, 2024 · 4c3dd25 · 4c3dd25
1 parent 8fa6776
commit 4c3dd25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 FROM ubuntu:22.04
 
 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann"
@@ -261,6 +262,9 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann"
 =======
 # syntax=docker/dockerfile:1.11@sha256:1f2be5a2aa052cbd9aedf893d17c63277c3d1c51b3fb0f3b029c6b34f658d057
 >>>>>>> 3f0b69fdf5 (CI(deps): Update docker/dockerfile Docker tag to v1.11 (#4621))
+=======
+# syntax=docker/dockerfile:1.11@sha256:10c699f1b6c8bdc8f6b4ce8974855dd8542f1768c26eb240237b8f1c9c6c9976
+>>>>>>> 600caae8f1 (CI(deps): Update docker/dockerfile:1.11 Docker digest to 10c699f (#4669))
 
 # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
 #       Changes to this file must be copied over to the other file.

diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 FROM ubuntu:22.04
 
 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann"
@@ -261,6 +262,9 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann"
 =======
 # syntax=docker/dockerfile:1.11@sha256:1f2be5a2aa052cbd9aedf893d17c63277c3d1c51b3fb0f3b029c6b34f658d057
 >>>>>>> 3f0b69fdf5 (CI(deps): Update docker/dockerfile Docker tag to v1.11 (#4621))
+=======
+# syntax=docker/dockerfile:1.11@sha256:10c699f1b6c8bdc8f6b4ce8974855dd8542f1768c26eb240237b8f1c9c6c9976
+>>>>>>> 600caae8f1 (CI(deps): Update docker/dockerfile:1.11 Docker digest to 10c699f (#4669))
 
 # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
 #       Changes to this file must be copied over to the other file.