Skip to content

Commit

Permalink
Fixed paths after merge
Browse files Browse the repository at this point in the history
Signed-off-by: Pawel Proskurnicki <[email protected]>
  • Loading branch information
pawelpros committed Jun 14, 2024
1 parent c7b905d commit 3c9266d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/kbs-build-and-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,20 @@ jobs:
tag:
- kbs
- kbs-grpc-as
- kbs-ita-as
include:
- tag: kbs
docker_file: kbs/docker/Dockerfile
https_crypto: openssl
name: build-in AS
- tag: kbs-grpc-as
docker_file: kbs/docker/Dockerfile.coco-as-grpc
docker_file: kbs/docker/coco-as-grpc/Dockerfile
https_crypto: rustls
name: gRPC AS
- tag: kbs-ita-as
docker_file: kbs/docker/intel-trust-authority/Dockerfile
https_crypto: rustls
name: Intel Trust Authority AS
runs-on: ${{ matrix.instance }}

steps:
Expand Down Expand Up @@ -78,6 +83,7 @@ jobs:
image:
- kbs
- kbs-grpc-as
- kbs-ita-as
permissions:
packages: write
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions hack/release-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ declare -g release_tag
declare -A staged_to_release=(
["staged-images/kbs"]="key-broker-service"
["staged-images/kbs-grpc-as"]="key-broker-service"
["staged-images/kbs-ita-as"]="key-broker-service"
["staged-images/rvps"]="reference-value-provider-service"
["staged-images/coco-as-grpc"]="attestation-service"
["staged-images/coco-as-restful"]="attestation-service"
Expand Down
5 changes: 3 additions & 2 deletions kbs/docker/intel-trust-authority/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
FROM rust:latest as builder
ARG ARCH=x86_64
ARG HTTPS_CRYPTO=rustls

WORKDIR /usr/src/kbs
COPY . .

RUN apt-get update && apt install -y git

# Build and Install KBS
ARG KBS_FEATURES=intel-trust-authority-as,rustls,resource,opa
RUN cargo install --path kbs/src/kbs --no-default-features --features ${KBS_FEATURES}
RUN cargo install --path kbs/src/kbs --no-default-features --features intel-trust-authority-as,${HTTPS_CRYPTO},resource,opa

FROM ubuntu:22.04

Expand Down

0 comments on commit 3c9266d

Please sign in to comment.