From 40e5fbe9f107856cb78aae81f0c312d371638ba9 Mon Sep 17 00:00:00 2001 From: Evelyn Alicke Date: Wed, 27 Mar 2024 11:51:47 +0100 Subject: [PATCH] chore(gh-actions): provide both docker and binary releases --- .github/workflows/build-docker.yml | 19 +++++++++++++++++++ .github/workflows/build-rust.yml | 13 +++++++++++++ .github/workflows/build.yml | 28 ---------------------------- docker-compose.yml | 7 ++++--- 4 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/build-docker.yml create mode 100644 .github/workflows/build-rust.yml delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml new file mode 100644 index 0000000..f3eebc6 --- /dev/null +++ b/.github/workflows/build-docker.yml @@ -0,0 +1,19 @@ +--- +name: Docker + +on: + push: + branches: [ "main" ] + tags: [ '*' ] + pull_request: + +jobs: + docker: + uses: famedly/github-workflows/.github/workflows/docker.yml@main + with: + push: ${{ github.event_name != 'pull_request' }} # Always build, don't publish on pull requests + registry_user: famedly-ci + registry: docker-oss.nexus.famedly.de + image_name: openmetrics-vici-exporter + build_args: "VERSION=${{ matrix.version }}" + secrets: inherit diff --git a/.github/workflows/build-rust.yml b/.github/workflows/build-rust.yml new file mode 100644 index 0000000..5cbc627 --- /dev/null +++ b/.github/workflows/build-rust.yml @@ -0,0 +1,13 @@ +--- +name: Rust + +on: + push: + branches: [main] + tags: ['*'] + pull_request: + +jobs: + build: + uses: famedly/github-workflows/.github/workflows/rust.yml@main + secrets: inherit diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 969e740..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: CI -on: - push: - tags: - - 'v*.*.*' - release: - types: [ published ] -jobs: - docker: - permissions: write-all - runs-on: ubuntu-latest - steps: - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ github.token }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - push: true - platforms: linux/amd64 - tags: | - ghcr.io/${{ github.repository }}:latest - ghcr.io/${{ github.repository }}:${{ github.ref_name }} diff --git a/docker-compose.yml b/docker-compose.yml index 4da34ef..95af8ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,8 @@ version: '3' services: - ove: + openmetrics-vici-exporter: + image: docker-oss.famedly.de/openmetrics-vici-exporter restart: "unless-stopped" environment: - VICI_EXPORTER_VICI_SOCKET="/var/run/charon.vici" @@ -9,7 +10,7 @@ services: - VICI_EXPORTER_SERVER_ADDRESS=0.0.0.0 - VICI_EXPORTER_SERVER_PORT=8001 volumes: - #- ./config.yml:/opt/openmetrics-vici-exporter/config.yml + # - ./config.yml:/opt/openmetrics-vici-exporter/config.yml - /var/run/charon.vici:/var/run/charon.vici ports: - - 8111:80/tcp + - 8001:8001/tcp