Skip to content

Commit

Permalink
chore: Clone submodules in clusterfuzzlite Dockerfile.
Browse files Browse the repository at this point in the history
Needed for the build afterwards.

Also added the cflite Dockerfile to automatic CI builds so changes to it
are checked in pull requests.

Also fixed the tokstyle docker image. It needs clang instead of gcc now.
  • Loading branch information
iphydf committed Mar 30, 2022
1 parent 7db0c80 commit 09575dc
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
1 change: 1 addition & 0 deletions .clusterfuzzlite/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ WORKDIR $SRC
COPY . $SRC/c-toxcore
# Working directory for build.sh.
WORKDIR $SRC/c-toxcore
RUN git submodule update --init --recursive
# Copy build.sh into $SRC dir.
COPY ./.clusterfuzzlite/build.sh $SRC/
22 changes: 22 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,28 @@ jobs:
cache-from: type=registry,ref=toxchat/bootstrap-node:latest-websocket
cache-to: type=inline

docker-clusterfuzz:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
if: ${{ github.event_name == 'push' }}
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
with:
context: "."
file: .clusterfuzzlite/Dockerfile
push: ${{ github.event_name == 'push' }}
tags: toxchat/c-toxcore:clusterfuzz
cache-from: type=registry,ref=toxchat/c-toxcore:clusterfuzz
cache-to: type=inline

docker-fuzzer:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion other/docker/tokstyle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:20.04

RUN apt-get update && apt-get install --no-install-recommends -y \
ca-certificates \
gcc \
clang \
git \
libopus-dev \
libsodium-dev \
Expand Down

0 comments on commit 09575dc

Please sign in to comment.