Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump integritee-dev image, switch to Ubuntu 22.04 Jammy #1207

Merged
merged 3 commits into from
Mar 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ env:
jobs:
cancel_previous_runs:
name: Cancel Previous Runs
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ secrets.GITHUB_TOKEN }}

build-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -93,8 +93,8 @@ jobs:
path: integritee-cli-client-${{ matrix.flavor_id }}-${{ github.sha }}.tar.gz

clippy:
runs-on: ubuntu-latest
container: "integritee/integritee-dev:0.1.12"
runs-on: ubuntu-22.04
container: "integritee/integritee-dev:0.1.13"
steps:
- uses: actions/checkout@v3
- name: init rust
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
uses: andymckay/cancel-action@0.2

fmt:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: init rust
Expand All @@ -152,7 +152,7 @@ jobs:
uses: andymckay/cancel-action@0.2

integration-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: ${{ always() }}
needs: build-test
env:
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
release:
name: Draft Release
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [build-test, integration-tests]
outputs:
release_url: ${{ steps.create-release.outputs.html_url }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
purge-image:
name: Delete image from ghcr.io
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
binary: ["integritee-client", "integritee-demo-validateer"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check_for_matching_labels:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.base_ref == 'master' && github.event.pull_request.draft == false
steps:
- name: Label check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
main:
name: Push Integritee Services to Dockerhub
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
binary: ["integritee-demo-validateer", "integritee-client"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
publish-draft-release:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout sources
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM integritee/integritee-dev:0.1.12
FROM integritee/integritee-dev:0.1.13
LABEL maintainer="zoltan@integritee.network"

# By default we warp the service
Expand Down
6 changes: 3 additions & 3 deletions build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

### Builder Stage
##################################################
FROM integritee/integritee-dev:0.1.12 AS builder
FROM integritee/integritee-dev:0.1.13 AS builder
LABEL maintainer="zoltan@integritee.network"

# set environment variables
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN cargo test --release
# A builder stage that uses sccache to speed up local builds with docker
# Installation and setup of sccache should be moved to the integritee-dev image, so we don't
# always need to compile and install sccache on CI (where we have no caching so far).
FROM integritee/integritee-dev:0.1.12 AS cached-builder
FROM integritee/integritee-dev:0.1.13 AS cached-builder
LABEL maintainer="zoltan@integritee.network"

# set environment variables
Expand Down Expand Up @@ -81,7 +81,7 @@ RUN --mount=type=cache,id=cargo,target=/root/work/.cache/sccache cargo test --re

### Base Runner Stage
##################################################
FROM ubuntu:20.04 AS runner
FROM ubuntu:22.04 AS runner

RUN apt update && apt install -y libssl-dev iproute2 curl

Expand Down