From 1e11865c4c92fda688fed966abf3ed975e73f0df Mon Sep 17 00:00:00 2001 From: iphydf Date: Thu, 23 Dec 2021 15:44:48 +0000 Subject: [PATCH] chore: Add bootstrap daemon docker image build. This will also push to dockerhub on merge. --- .github/workflows/ci.yml | 16 +++++++++++++++- .travis/tox-bootstrapd-docker | 2 ++ .../docker/tox-bootstrapd.sha256 | 2 +- other/print-version | 4 ++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 other/print-version diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecdfc1b7..55932516 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,10 +37,24 @@ jobs: - name: Cross compilation run: .travis/cmake-win64 script - freebsd: + build-freebsd: runs-on: ubuntu-latest container: toxchat/freebsd steps: - uses: actions/checkout@v2 - name: Build on FreeBSD run: .travis/cmake-freebsd-stage2 + + build-bootstrap-docker: + runs-on: ubuntu-latest + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - uses: actions/checkout@v2 + - name: Docker Build + run: .travis/tox-bootstrapd-docker + - name: Push images to DockerHub + if: ${{ github.event_name == 'push' }} + run: | + docker push toxchat/bootstrap-node:latest + docker push toxchat/bootstrap-node:"$(other/print-version)" diff --git a/.travis/tox-bootstrapd-docker b/.travis/tox-bootstrapd-docker index b6682466..b12abd6a 100755 --- a/.travis/tox-bootstrapd-docker +++ b/.travis/tox-bootstrapd-docker @@ -67,3 +67,5 @@ if ! other/fun/bootstrap_node_info.py ipv4 localhost 33445; then echo "Error: Unable to get bootstrap node info" exit 1 fi + +docker tag toxchat/bootstrap-node:latest toxchat/bootstrap-node:"$(other/print-version)" diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 index 250b0ab2..6d0ea00c 100644 --- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 +++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 @@ -1 +1 @@ -ac14ae6877df0b2af683e9578cb7a548d755a3c78ceb26f169163c725963ff50 /usr/local/bin/tox-bootstrapd +7cce630be98faab64c804255e060c85a63ea9f4401ffd1f12122ba1c5cfc45ce /usr/local/bin/tox-bootstrapd diff --git a/other/print-version b/other/print-version new file mode 100755 index 00000000..d96647e4 --- /dev/null +++ b/other/print-version @@ -0,0 +1,4 @@ +#!/bin/sh + +VERSION="$(grep '^AC_INIT' configure.ac | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')" +echo "$VERSION"