Merge branch 'main' into snyk-fix-4011f2ca0e8f68c1d611d0455b25e82a

Signed-off-by: Theodore Omtzigt <[email protected]>
stillwater-sc · Dec 12, 2023 · e8ea431 · e8ea431
2 parents 6caa04a + 9d6a056
commit e8ea431
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ RUN cmake -DBUILD_ALL=ON .. && make
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
 #FROM ubuntu:22.10 as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:mantic as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils

diff --git a/docker/Dockerfile.clang11 b/docker/Dockerfile.clang11
@@ -27,7 +27,7 @@ RUN cmake -D$target=ON -DBUILD_CMD_LINE_TOOLS=ON -DBUILD_DEMONSTRATION=OFF .. &&
 # RELEASE stage
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:23.10 as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils

diff --git a/docker/Dockerfile.clang12 b/docker/Dockerfile.clang12
@@ -27,7 +27,7 @@ RUN cmake -D$target=ON -DBUILD_CMD_LINE_TOOLS=ON -DBUILD_DEMONSTRATION=OFF .. &&
 # RELEASE stage
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:mantic as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils

diff --git a/docker/Dockerfile.clang13 b/docker/Dockerfile.clang13
@@ -27,7 +27,7 @@ RUN cmake -D$target=ON -DBUILD_CMD_LINE_TOOLS=ON -DBUILD_DEMONSTRATION=OFF .. &&
 # RELEASE stage
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:mantic as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils

diff --git a/docker/Dockerfile.clang14 b/docker/Dockerfile.clang14
@@ -27,7 +27,7 @@ RUN cmake -D$target=ON  -DBUILD_CMD_LINE_TOOLS=ON -DBUILD_DEMONSTRATION=OFF .. &
 # RELEASE stage
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:23.10 as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils

diff --git a/docker/Dockerfile.gcc10 b/docker/Dockerfile.gcc10
@@ -27,7 +27,7 @@ RUN cmake -D$target=ON  -DBUILD_CMD_LINE_TOOLS=ON -DBUILD_DEMONSTRATION=OFF .. &
 # RELEASE stage
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:mantic as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils

diff --git a/docker/Dockerfile.gcc11 b/docker/Dockerfile.gcc11
@@ -27,7 +27,7 @@ RUN cmake -D$target=ON  -DBUILD_CMD_LINE_TOOLS=ON -DBUILD_DEMONSTRATION=OFF .. &
 # RELEASE stage
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:mantic as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils

diff --git a/docker/Dockerfile.gcc12 b/docker/Dockerfile.gcc12
@@ -27,7 +27,7 @@ RUN cmake -D$target=ON  -DBUILD_CMD_LINE_TOOLS=ON -DBUILD_DEMONSTRATION=OFF .. &
 # RELEASE stage
 #FROM alpine:latest as release    # hitting a segfault during startup of some playground programs
 #FROM debian:buster-slim as release
-FROM ubuntu:mantic-20231011 as release
+FROM ubuntu:mantic as release
 LABEL Theodore Omtzigt
 
 #RUN apk add --no-cache libc6-compat libstdc++ cmake make bash gawk sed grep bc coreutils