Container build optimization

Better docker cache usage

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
This commit is contained in:
Sebastian Waldbauer
2020-12-17 13:11:47 +01:00
parent 0d80353c3d
commit 3a105d97bc

View File

@@ -5,21 +5,13 @@ ARG BUILD_DATE
ARG VCS_REF
ARG BUILD_VERSION
LABEL maintainer="Sebastian Waldbauer <waldbauer@cert.at>" \
LABEL maintainer="IntelMQ Team <intelmq-team@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/certat/intelmq-docker.git" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vendor="CERT.AT" \
org.label-schema.version=$BUILD_VERSION
COPY ./intelmq /opt/intelmq
COPY ./intelmq-manager /opt/intelmq-manager
WORKDIR /opt
org.label-schema.vendor="CERT.AT"
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
@@ -34,6 +26,16 @@ RUN apt-get update \
python3-pip \
&& rm -rf /var/lib/apt/lists/*
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.version=$BUILD_VERSION
COPY ./intelmq /opt/intelmq
COPY ./intelmq-manager /opt/intelmq-manager
WORKDIR /opt
RUN useradd -d /opt/intelmq -U -s /bin/bash intelmq \
&& adduser intelmq sudo \
&& echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \