Skip to content

Commit

Permalink
Merge branch 'main' into renovate/clap-4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
gastonfournier authored May 10, 2023
2 parents 54b5929 + a6779cd commit 8311857
Show file tree
Hide file tree
Showing 47 changed files with 1,509 additions and 149 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-docker-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
permissions:
id-token: write
contents: read
packages: write

jobs:
dockerpublish:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-main-docker-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
permissions:
id-token: write
contents: read
packages: write

jobs:
dockerpublish:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/docker_ecr_arch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ on:
- ".github/workflows/docker_ecr_arch64.yaml"
tags:
- unleash-edge-v[0-9]+.*

permissions:
id-token: write
contents: read
jobs:
docker:
runs-on: ubuntu-latest
Expand All @@ -33,12 +35,11 @@ jobs:
- name: Build release
run: |
cross build --release --target=aarch64-unknown-linux-gnu
- name: Configure aws credentials
uses: aws-actions/configure-aws-credentials@v1-node16
id: aws-eu-north
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
role-to-assume: arn:aws:iam::726824350591:role/unleash-github-ecr-private-publish-role
role-session-name: actions-push-to-ecr-private
aws-region: eu-north-1
- name: Login to ECR
id: login-ecr-eu-north
Expand Down
206 changes: 203 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[target.x86_64-unknown-linux-gnu]
dockerfile = "Dockerfile.cross.x86_64"
[target.aarch64-unknown-linux-gnu]
dockerfile = "Dockerfile.cross.aarch64"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/distroless/cc
FROM gcr.io/distroless/cc-debian11

COPY target/aarch64-unknown-linux-gnu/release/unleash-edge /unleash-edge
ENTRYPOINT ["/unleash-edge"]
3 changes: 3 additions & 0 deletions Dockerfile.cross.aarch64
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge
RUN dpkg --add-architecture arm64
RUN apt-get update && apt-get install --assume-yes libssl-dev:arm64
Loading

0 comments on commit 8311857

Please sign in to comment.