mirror of
https://github.com/zeek/zeek.git
synced 2025-10-17 14:08:20 +00:00
Merge remote-tracking branch 'origin/topic/timw/fix-alpine-ci-image'
* origin/topic/timw/fix-alpine-ci-image: Add missing include for int32_t in DebugCmds.h CI: Remove emacs backup file of fedora-38 Dockerfile CI: Fix building of alpine image with regards to python packages
This commit is contained in:
commit
ee5579c40a
3 changed files with 3 additions and 32 deletions
|
@ -23,9 +23,10 @@ RUN apk add --no-cache \
|
|||
openssl-dev \
|
||||
procps \
|
||||
py3-pip \
|
||||
py3-websockets \
|
||||
python3 \
|
||||
python3-dev \
|
||||
swig \
|
||||
zlib-dev
|
||||
|
||||
RUN pip3 install websockets junit2html
|
||||
RUN pip3 install --break-system-packages junit2html
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
FROM fedora:36
|
||||
|
||||
# A version field to invalidate Cirrus's build cache when needed, as suggested in
|
||||
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
|
||||
ENV DOCKERFILE_VERSION 20220614
|
||||
|
||||
RUN dnf -y install \
|
||||
bison \
|
||||
ccache \
|
||||
cmake \
|
||||
diffutils \
|
||||
findutils \
|
||||
flex \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
git \
|
||||
libpcap-devel \
|
||||
make \
|
||||
openssl \
|
||||
openssl-devel \
|
||||
procps-ng \
|
||||
python3 \
|
||||
python3-devel \
|
||||
python3-pip\
|
||||
sqlite \
|
||||
swig \
|
||||
which \
|
||||
zlib-devel \
|
||||
&& dnf clean all && rm -rf /var/cache/dnf
|
||||
|
||||
RUN pip3 install websockets junit2html
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <deque>
|
||||
#include <string>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue