Skip to content

Commit

Permalink
Merge pull request #2165 from keboola/jt-dev-docker
Browse files Browse the repository at this point in the history
fix: Simplify Dockerfiles
  • Loading branch information
Matovidlo authored Dec 3, 2024
2 parents 91d1e31 + a9578d9 commit 9257583
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 1 addition & 3 deletions provisioning/dev/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ 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
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 && \
Expand Down
5 changes: 2 additions & 3 deletions provisioning/stream/docker/service/race/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 9257583

Please sign in to comment.