Combined some build steps

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
This commit is contained in:
Sebastian Waldbauer
2020-11-03 13:30:57 +01:00
parent d94eee8c8b
commit 50d5eb4def

View File

@@ -1,19 +1,19 @@
FROM debian:buster
LABEL maintainer="Sebastian Waldbauer <waldbauer@cert.at>"
ARG BUILD_DATE
ARG VCS_REF
ARG BUILD_VERSION
LABEL org.label-schema.schema-version="1.0"
LABEL org.label-schema.build-date=$BUILD_DATE
LABEL org.label-schema.name="certat/intelmq-full"
LABEL org.label-schema.description="IntelMQ with core & manager"
LABEL org.label-schema.url="https://intelmq.org/"
LABEL org.label-schema.vcs-url="https://github.com/certtools/intelmq"
LABEL org.label-schema.vcs-ref=$VCS_REF
LABEL org.label-schema.vendor="CERT.AT"
LABEL org.label-schema.version=$BUILD_VERSION
LABEL maintainer="Sebastian Waldbauer <waldbauer@cert.at>" \
org.label-schema.schema-version="1.0" \
org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="certat/intelmq-full" \
org.label-schema.description="IntelMQ with core & manager" \
org.label-schema.url="https://intelmq.org/" \
org.label-schema.vcs-url="https://github.com/certtools/intelmq" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vendor="CERT.AT" \
org.label-schema.version=$BUILD_VERSION
ENV LANG C.UTF-8
COPY ./intelmq /opt/intelmq
@@ -30,12 +30,15 @@ RUN apt-get update \
python3-requests-mock \
python3-dev \
python3-setuptools \
python3-pip
python3-pip \
&& rm -rf /var/lib/apt/lists/*
RUN useradd -d /opt/intelmq -U -s /bin/bash intelmq
RUN adduser intelmq sudo
RUN echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
RUN sudo chown -R intelmq:intelmq /opt/intelmq
RUN useradd -d /opt/intelmq -U -s /bin/bash intelmq \
&& adduser intelmq sudo \
&& echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \
&& sudo chown -R intelmq:intelmq /opt/intelmq
ADD --chown=intelmq:intelmq entrypoint.sh /opt/entrypoint.sh
### Install IntelMQ
RUN cd /opt/intelmq \
@@ -54,4 +57,4 @@ RUN mkdir /opt/intelmq/etc/manager/ \
USER intelmq
ENTRYPOINT [ "hug", "-f", "./intelmq-manager/intelmq_manager/serve.py", "-p8080" ]
ENTRYPOINT [ "entrypoint.sh" ]