From b34f20251706bdb81fae2af1b39610847aea1629 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 19 Aug 2022 10:48:48 +0200 Subject: [PATCH] Bump OPA to 0.43 and Rust to 1.63 in Docker image Also bumps the Dockerfile frontend to 1.4 --- Dockerfile | 6 +++--- crates/policy/policies/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 931ac642b..368599e78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:1.3 +# syntax = docker/dockerfile:1.4 # 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 @@ -12,9 +12,9 @@ # The Debian version and version name must be in sync ARG DEBIAN_VERSION=11 ARG DEBIAN_VERSION_NAME=bullseye -ARG RUSTC_VERSION=1.61.0 +ARG RUSTC_VERSION=1.63.0 ARG NODEJS_VERSION=16 -ARG OPA_VERSION=0.40.0 +ARG OPA_VERSION=0.43.0 ## Build stage that builds the static files/frontend ## FROM --platform=${BUILDPLATFORM} docker.io/library/node:${NODEJS_VERSION}-${DEBIAN_VERSION_NAME}-slim AS static-files diff --git a/crates/policy/policies/Makefile b/crates/policy/policies/Makefile index 5e66b3933..7ea32cb4f 100644 --- a/crates/policy/policies/Makefile +++ b/crates/policy/policies/Makefile @@ -1,12 +1,13 @@ # Set to 1 to run OPA through Docker DOCKER := 0 +OPA_DOCKER_IMAGE := docker.io/openpolicyagent/opa:0.43.0 ifeq ($(DOCKER), 0) OPA := opa OPA_RW := opa else - OPA := docker run -i -v $(shell pwd):/policies:ro -w /policies --rm docker.io/openpolicyagent/opa:0.41.0 - OPA_RW := docker run -i -v $(shell pwd):/policies -w /policies --rm docker.io/openpolicyagent/opa:0.41.0 + OPA := docker run -i -v $(shell pwd):/policies:ro -w /policies --rm $(OPA_DOCKER_IMAGE) + OPA_RW := docker run -i -v $(shell pwd):/policies -w /policies --rm $(OPA_DOCKER_IMAGE) endif policy.wasm: client_registration.rego register.rego authorization_grant.rego