From 57305563e7f536079cf1dfa76d66dd3249bb9469 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sat, 11 Feb 2023 14:47:00 -0800
Subject: [PATCH] docker/ubuntu/22.04: Upgrade to llvm-15.

---
 .appveyor.yml                       |  2 +-
 README.md                           |  2 +-
 docker/build-and-push-images.sh     | 17 +++++++++--------
 docker/ubuntu/22.04/full/Dockerfile |  1 -
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 3627b3467..05797159f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,7 +15,7 @@ environment:
       DOCKER_IMAGE: jevolk/construct:ubuntu-22.04-base-build-gcc-12-amd64
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
-      DOCKER_IMAGE: jevolk/construct:ubuntu-22.04-full-build-clang-14-amd64
+      DOCKER_IMAGE: jevolk/construct:ubuntu-22.04-full-build-clang-15-amd64
 
 for:
 -
diff --git a/README.md b/README.md
index 3de6a61a6..b240814f3 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 
 | Fully Featured Builds | Minimal Dependencies |
 |:---|:---|
-| [![](https://img.shields.io/docker/image-size/jevolk/construct/ubuntu-22.04-full-built-clang-14-amd64.svg?logoWidth=25&label=ubuntu%2022.04%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags) | [![](https://img.shields.io/docker/image-size/jevolk/construct/ubuntu-22.04-base-built-gcc-12-amd64.svg?logoWidth=25&label=ubuntu%2022.04%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags)
+| [![](https://img.shields.io/docker/image-size/jevolk/construct/ubuntu-22.04-full-built-clang-15-amd64.svg?logoWidth=25&label=ubuntu%2022.04%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags) | [![](https://img.shields.io/docker/image-size/jevolk/construct/ubuntu-22.04-base-built-gcc-12-amd64.svg?logoWidth=25&label=ubuntu%2022.04%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags)
 | [![](https://img.shields.io/docker/image-size/jevolk/construct/alpine-3.16-full-built-clang-amd64.svg?logoWidth=25&label=alpine%203.16%20clang%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags) | [![](https://img.shields.io/docker/image-size/jevolk/construct/alpine-3.16-base-built-clang-amd64.svg?logoWidth=25&label=alpine%203.16%20clang%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags)
 | [![](https://img.shields.io/docker/image-size/jevolk/construct/alpine-3.16-full-built-gcc-amd64.svg?logoWidth=25&label=alpine%203.16%20gcc%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags) | [![](https://img.shields.io/docker/image-size/jevolk/construct/alpine-3.16-base-built-gcc-amd64.svg?logoWidth=25&label=alpine%203.16%20gcc%20amd64&logo=Docker&style=flat-square&color=5965AF)](https://registry.hub.docker.com/r/jevolk/construct/tags)
 
diff --git a/docker/build-and-push-images.sh b/docker/build-and-push-images.sh
index 0c9d98beb..b50066304 100755
--- a/docker/build-and-push-images.sh
+++ b/docker/build-and-push-images.sh
@@ -137,12 +137,13 @@ docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-base-test-gcc-12-amd64 $BASEDIR/u
 ARGS="$ARGS_"
 ARGS="$ARGS --platform linux/amd64"
 ARGS="$ARGS --build-arg feature=full"
-ARGS="$ARGS --build-arg extra_packages_dev=clang-14"
-ARGS="$ARGS --build-arg extra_packages_dev1=llvm-14-dev"
-ARGS="$ARGS --build-arg cc=clang-14 --build-arg cxx=clang++-14"
-docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-full-build-clang-14-amd64 $BASEDIR/ubuntu/22.04/build
-docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-full-built-clang-14-amd64 $BASEDIR/ubuntu/22.04/built
-docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-full-test-clang-14-amd64 $BASEDIR/ubuntu/22.04/test
+ARGS="$ARGS --build-arg extra_packages_dev=clang-15"
+ARGS="$ARGS --build-arg extra_packages_dev1=llvm-15-dev"
+ARGS="$ARGS --build-arg extra_packages_dev2=llvm-spirv-15"
+ARGS="$ARGS --build-arg cc=clang-15 --build-arg cxx=clang++-15"
+docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-full-build-clang-15-amd64 $BASEDIR/ubuntu/22.04/build
+docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-full-built-clang-15-amd64 $BASEDIR/ubuntu/22.04/built
+docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-full-test-clang-15-amd64 $BASEDIR/ubuntu/22.04/test
 
 #
 # Pushed images
@@ -154,8 +155,8 @@ docker push $ACCT/$REPO:ubuntu-22.04-base-built-gcc-9-amd64
 docker push $ACCT/$REPO:ubuntu-22.04-base-build-gcc-12-amd64
 docker push $ACCT/$REPO:ubuntu-22.04-base-built-gcc-12-amd64
 
-docker push $ACCT/$REPO:ubuntu-22.04-full-build-clang-14-amd64
-docker push $ACCT/$REPO:ubuntu-22.04-full-built-clang-14-amd64
+docker push $ACCT/$REPO:ubuntu-22.04-full-build-clang-15-amd64
+docker push $ACCT/$REPO:ubuntu-22.04-full-built-clang-15-amd64
 
 ###############################################################################
 #
diff --git a/docker/ubuntu/22.04/full/Dockerfile b/docker/ubuntu/22.04/full/Dockerfile
index d05100336..7083a316e 100644
--- a/docker/ubuntu/22.04/full/Dockerfile
+++ b/docker/ubuntu/22.04/full/Dockerfile
@@ -14,7 +14,6 @@ ENV packages_dev="\
 ${packages_dev} \
 libgraphicsmagick1-dev \
 libpng-dev \
-llvm-spirv \
 xxd \
 "