From 28a07adf8e6e414e267a65ea07c2b6acd58ffdcb Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Tue, 14 Nov 2023 11:41:23 +0100
Subject: [PATCH] dockerfile: bump rust, opa, nodejs and debian version

---
 .github/workflows/build.yaml    |  2 +-
 .github/workflows/ci.yaml       |  6 +++---
 .github/workflows/coverage.yaml |  4 ++--
 Dockerfile                      | 14 +++++++-------
 policies/Makefile               |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9855b8a80..7323df6b1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -45,7 +45,7 @@ jobs:
       - name: Setup OPA
         uses: open-policy-agent/setup-opa@v2.1.0
         with:
-          version: 0.55.0
+          version: 0.58.0
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fc3902ed3..6cd0b2cd7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup OPA
         uses: open-policy-agent/setup-opa@v2.1.0
         with:
-          version: 0.55.0
+          version: 0.58.0
 
       - name: Lint policies
         working-directory: ./policies
@@ -202,7 +202,7 @@ jobs:
       - name: Setup OPA
         uses: open-policy-agent/setup-opa@v2.1.0
         with:
-          version: 0.55.0
+          version: 0.58.0
 
       - name: Compile OPA policies
         working-directory: ./policies
@@ -264,7 +264,7 @@ jobs:
       - name: Setup OPA
         uses: open-policy-agent/setup-opa@v2.1.0
         with:
-          version: 0.55.0
+          version: 0.58.0
 
       - name: Compile OPA policies
         working-directory: ./policies
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index 30ae59c8f..3f9fae5a8 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup OPA
         uses: open-policy-agent/setup-opa@v2.1.0
         with:
-          version: 0.55.0
+          version: 0.58.0
 
       - name: Run OPA tests with coverage
         working-directory: ./policies
@@ -123,7 +123,7 @@ jobs:
       - name: Setup OPA
         uses: open-policy-agent/setup-opa@v2.1.0
         with:
-          version: 0.55.0
+          version: 0.58.0
 
       - name: Compile OPA policies
         working-directory: ./policies
diff --git a/Dockerfile b/Dockerfile
index 11966a71e..8248a5823 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.4
+# syntax = docker/dockerfile:1.6
 
 # Builds a minimal image with the binary only. It is multi-arch capable,
 # cross-building to aarch64 and x86_64. When cross-compiling, Docker sets two
@@ -6,17 +6,17 @@
 # being the platform being built.
 
 # The Debian version and version name must be in sync
-ARG DEBIAN_VERSION=11
-ARG DEBIAN_VERSION_NAME=bullseye
-ARG RUSTC_VERSION=1.72.0
+ARG DEBIAN_VERSION=12
+ARG DEBIAN_VERSION_NAME=bookworm
+ARG RUSTC_VERSION=1.73.0
 # XXX: Upgrade to 0.10.0 blocked by https://github.com/ziglang/zig/issues/10915#issuecomment-1354548110
 # XXX: Upgrade to 0.11.0 blocked by https://github.com/rust-cross/cargo-zigbuild/issues/162
 ARG ZIG_VERSION=0.9.1
-ARG NODEJS_VERSION=18.17.1
-ARG OPA_VERSION=0.55.0
+ARG NODEJS_VERSION=20.9.0
+ARG OPA_VERSION=0.58.0
 ARG CARGO_AUDITABLE_VERSION=0.6.1
 ARG CARGO_CHEF_VERSION=0.1.62
-ARG CARGO_ZIGBUILD_VERSION=0.17.3
+ARG CARGO_ZIGBUILD_VERSION=0.17.5
 
 ##########################################
 ## Build stage that builds the frontend ##
diff --git a/policies/Makefile b/policies/Makefile
index f67f53b50..177ff04b1 100644
--- a/policies/Makefile
+++ b/policies/Makefile
@@ -1,6 +1,6 @@
 # Set to 1 to run OPA through Docker
 DOCKER := 0
-OPA_DOCKER_IMAGE := docker.io/openpolicyagent/opa:0.55.0-debug
+OPA_DOCKER_IMAGE := docker.io/openpolicyagent/opa:0.58.0-debug
 
 INPUTS := \
 	client_registration.rego \