1
0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2026-01-03 17:02:28 +03:00

Upgrade Rust, OPA, Node in CI and Docker image

This commit is contained in:
Quentin Gliech
2022-12-16 17:51:11 +01:00
parent 82421c493c
commit 5b28c1e6ce
3 changed files with 14 additions and 14 deletions

View File

@@ -29,7 +29,7 @@ jobs:
- name: Setup OPA
uses: open-policy-agent/setup-opa@v2.0.1
with:
version: 0.45.0
version: 0.47.3
- name: Lint policies
working-directory: ./policies
@@ -63,7 +63,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: 'npm'
cache-dependency-path: frontend/package-lock.json
@@ -90,7 +90,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: 'npm'
cache-dependency-path: frontend/package-lock.json
@@ -152,7 +152,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: 'npm'
cache-dependency-path: frontend/package-lock.json
@@ -189,7 +189,7 @@ jobs:
- name: Setup OPA
uses: open-policy-agent/setup-opa@v2.0.1
with:
version: 0.45.0
version: 0.47.3
- name: Compile OPA policies
working-directory: ./policies
@@ -221,7 +221,7 @@ jobs:
services:
postgres:
image: docker.io/library/postgres:14.4
image: docker.io/library/postgres:15.1
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
@@ -246,7 +246,7 @@ jobs:
- name: Setup OPA
uses: open-policy-agent/setup-opa@v2.0.1
with:
version: 0.45.0
version: 0.47.3
- name: Compile OPA policies
working-directory: ./policies
@@ -282,7 +282,7 @@ jobs:
services:
postgres:
image: docker.io/library/postgres:14.4
image: docker.io/library/postgres:15.1
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
@@ -308,7 +308,7 @@ jobs:
- name: Setup OPA
uses: open-policy-agent/setup-opa@v2.0.1
with:
version: 0.45.0
version: 0.47.3
- name: Compile OPA policies
working-directory: ./policies

View File

@@ -12,10 +12,10 @@
# The Debian version and version name must be in sync
ARG DEBIAN_VERSION=11
ARG DEBIAN_VERSION_NAME=bullseye
ARG RUSTC_VERSION=1.65.0
ARG RUSTC_VERSION=1.66.0
ARG ZIG_VERSION=0.9.1
ARG NODEJS_VERSION=18
ARG OPA_VERSION=0.45.0
ARG OPA_VERSION=0.47.3
##########################################
## Build stage that builds the frontend ##
@@ -150,7 +150,7 @@ COPY ./templates/ /share/templates
##################################
## Runtime stage, debug variant ##
##################################
FROM --platform=${TARGETPLATFORM} gcr.io/distroless/cc-debian${DEBIAN_VERSION}:debug-nonroot AS debug
FROM --platform=${TARGETPLATFORM} gcr.io/distroless/base-debian${DEBIAN_VERSION}:debug-nonroot AS debug
COPY --from=builder /usr/local/bin/mas-cli /usr/local/bin/mas-cli
COPY --from=share /share /usr/local/share/mas-cli
@@ -161,7 +161,7 @@ ENTRYPOINT ["/usr/local/bin/mas-cli"]
###################
## Runtime stage ##
###################
FROM --platform=${TARGETPLATFORM} gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot
FROM --platform=${TARGETPLATFORM} gcr.io/distroless/base-debian${DEBIAN_VERSION}:nonroot
COPY --from=builder /usr/local/bin/mas-cli /usr/local/bin/mas-cli
COPY --from=share /share /usr/local/share/mas-cli

View File

@@ -1,6 +1,6 @@
# Set to 1 to run OPA through Docker
DOCKER := 0
OPA_DOCKER_IMAGE := docker.io/openpolicyagent/opa:0.45.0
OPA_DOCKER_IMAGE := docker.io/openpolicyagent/opa:0.47.3
ifeq ($(DOCKER), 0)
OPA := opa