From a9578d93b168d841032cae1ef52efc2375964602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Mon, 2 Dec 2024 14:38:03 +0100 Subject: [PATCH] fix: Simplify Dockerfiles --- provisioning/dev/docker/Dockerfile | 4 +--- provisioning/stream/docker/service/race/Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/provisioning/dev/docker/Dockerfile b/provisioning/dev/docker/Dockerfile index 9cb0ec892d..befa74da2e 100644 --- a/provisioning/dev/docker/Dockerfile +++ b/provisioning/dev/docker/Dockerfile @@ -9,7 +9,7 @@ ENV GOLANGCI_LINT_CACHE=/tmp/cache/golangci-lint ENV PATH="$PATH:$GOBIN" # Install packages -RUN apt-get update && apt-get install -y nano protobuf-compiler +RUN apt-get update && apt-get install --no-install-recommends --yes nano protobuf-compiler graphviz build-essential ENV EDITOR=nano # Install tools @@ -17,8 +17,6 @@ RUN mkdir -p /tmp/build COPY Makefile /tmp/build/Makefile COPY scripts /tmp/build/scripts RUN cd /tmp/build && make tools && cd / && rm -rf /tmp/build && go clean -cache -modcache -RUN apt update && apt install -y graphviz -RUN apt-get install --no-install-recommends --assume-yes build-essential # Install envsubstr and helm RUN curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-$(uname -s)-$(uname -m) -o /usr/local/bin/envsubst && \ diff --git a/provisioning/stream/docker/service/race/Dockerfile b/provisioning/stream/docker/service/race/Dockerfile index 42d5104c08..37b5830271 100644 --- a/provisioning/stream/docker/service/race/Dockerfile +++ b/provisioning/stream/docker/service/race/Dockerfile @@ -1,8 +1,7 @@ # Build container FROM golang:1.23.3-alpine3.20 AS buildContainer -RUN apk add -U --no-cache bash make curl -# This is needed for CGO_ENABLED racer -RUN apk add -U --no-cache gcc g++ +# gcc and g++ are needed for CGO_ENABLED racer +RUN apk add --update --no-cache bash make curl gcc g++ WORKDIR /app COPY Makefile Makefile