Skip to content

Commit

Permalink
Use singular line instead of separate run statements.
Browse files Browse the repository at this point in the history
  • Loading branch information
mattdurham committed May 6, 2024
1 parent 36ed1f7 commit 1befeb8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ ARG USERNAME="alloy"
LABEL org.opencontainers.image.source="https://github.com/grafana/alloy"

# Install dependencies needed at runtime.
RUN apt-get update
RUN apt-get install -qy libsystemd-dev tzdata ca-certificates
RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN apt-get update \
&& apt-get install -qy libsystemd-dev tzdata ca-certificates \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*


COPY --from=build /src/alloy/build/alloy /bin/alloy
Expand Down
10 changes: 5 additions & 5 deletions tools/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ FROM rfratto/viceroy:v0.4.0
# platform.
# Source: https://github.com/nodesource/distributions#installation-instructions

RUN apt-get update && apt-get install -qy ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
RUN apt-get update && apt-get install -qy nodejs
RUN rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -qy ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update && apt-get install -qy nodejs \
&& rm -rf /var/lib/apt/lists/*

# Install Yarn.
#
Expand Down

0 comments on commit 1befeb8

Please sign in to comment.