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.

Sign up for GitHub

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

Standardize base image #573

Merged
merged 1 commit into from
Aug 14, 2024
Merged

Standardize base image #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion so-idh/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.4-slim
FROM ghcr.io/security-onion-solutions/python:3.12.5-slim

WORKDIR /root/

Expand Down
11 changes: 2 additions & 9 deletions so-idstools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,16 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

FROM ghcr.io/security-onion-solutions/python:3-alpine
FROM ghcr.io/security-onion-solutions/python:3.12.5-slim

LABEL maintainer "Security Onion Solutions, LLC"
LABEL description="IDSTools for downloading rules"
LABEL description="IDSTools for downloading NIDS rules"

ARG GID=939
ARG UID=939
ARG USERNAME=socore
ARG VERSION=0.6.3

RUN apk add --no-cache --virtual .build-deps\
shadow

RUN apk add --no-cache bash

RUN mkdir -p /opt/so/idstools/bin && mkdir /opt/so/idstools/etc
COPY entrypoint.sh /opt/so/idstools/bin
RUN chmod +x /opt/so/idstools/bin/entrypoint.sh && chown -R ${UID}:${GID} /opt/so/idstools
Expand All @@ -39,8 +34,6 @@ RUN groupadd --gid ${GID} ${USERNAME} && \
#RUN pip install https://github.com/jasonish/py-idstools/archive/master.zip
RUN pip install https://github.com/Security-Onion-Solutions/py-idstools/archive/master.zip

RUN apk del .build-deps

USER ${USERNAME}
WORKDIR /opt/so/idstools/bin
ENTRYPOINT ["./entrypoint.sh"]
10 changes: 5 additions & 5 deletions so-pcaptools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/security-onion-solutions/python:3-slim AS builder
FROM ghcr.io/security-onion-solutions/python:3.12.5-slim AS builder

LABEL maintainer "Security Onion Solutions, LLC"
LABEL description="Tools for use with PCAP & EVTX files"
Expand All @@ -14,19 +14,19 @@ RUN wget http://f00l.de/pcapfix/pcapfix-${PCAPFIX_VERSION}.tar.gz && \
make && \
make install

FROM ghcr.io/security-onion-solutions/python:3-slim
FROM ghcr.io/security-onion-solutions/python:3.12.5-slim

ADD evtx_calc_timestamps.sh /evtx_calc_timestamps.sh
RUN chmod +x /evtx_calc_timestamps.sh

ADD timeshift.py /timeshift.py
RUN chmod +x /timeshift.py

# libwiretap11 is required for capinfo libaries
# libwiretap13 is required for capinfo libaries
# jq is required for evtx timestamp script
RUN apt-get update && apt-get install -y --no-install-recommends --force-yes libwiretap11 git jq && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y --no-install-recommends --force-yes libwiretap13 git jq && rm -rf /var/lib/apt/lists/*
RUN pip3 install evtx elasticsearch==7.17.1 tqdm orjson importlib_metadata
RUN pip3 install evtx2es --no-dependencies

COPY --from=builder /usr/bin/pcapfix /usr/bin/
COPY --from=builder /usr/bin/capinfos /usr/bin/
COPY --from=builder /usr/bin/capinfos /usr/bin/
Loading