Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: build stream dev images with race #2159

Merged
merged 5 commits into from
Dec 3, 2024
Merged

fix: build stream dev images with race #2159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6488153
fix: Build images with race. WIP create 2 types of images, one with r…
Matovidlo Nov 27, 2024
c07461d
feat: Add new dockerfile to build the image with -race
Matovidlo Nov 28, 2024
91d1e31
fix: Remove not used library `libsqlite3-0`.
Matovidlo Dec 2, 2024
a9578d9
fix: Simplify Dockerfiles
jachym-tousek-keboola Dec 2, 2024
9257583
Merge pull request #2165 from keboola/jt-dev-docker
Matovidlo Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ run-templates-api:
build-stream-service:
CGO_ENABLED=0 go build -v -mod mod -ldflags "-s -w" -o "$(or $(BUILD_TARGET_PATH), ./target/stream/service)" ./cmd/stream

build-stream-service-with-race:
CGO_ENABLED=1 go build -race -v -mod mod -ldflags "-s -w" -o "$(or $(BUILD_TARGET_PATH), ./target/stream/service)" ./cmd/stream

run-stream-service:
rm -rf /tmp/stream-volumes && \
mkdir -p /tmp/stream-volumes/hdd/my-volume && \
air -c ./provisioning/stream/dev/.air.toml

run-stream-service-once: build-stream-service
run-stream-service-once: build-stream-service-with-race
./target/stream/service api http-source storage-writer storage-reader storage-coordinator

build-apps-proxy:
Expand Down
2 changes: 1 addition & 1 deletion provisioning/apps-proxy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY . .
RUN make build-apps-proxy

# Production container
FROM alpine:3.19
FROM alpine:3.20
RUN apk add -U --no-cache ca-certificates git

COPY --from=buildContainer /app/target/apps-proxy/proxy /app/server
Expand Down
1 change: 1 addition & 0 deletions provisioning/dev/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ 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 libsqlite3-0
jachym-tousek-keboola marked this conversation as resolved.
Show resolved Hide resolved

# 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
3 changes: 2 additions & 1 deletion provisioning/stream/docker/service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Build container
FROM golang:1.23.3-alpine3.20 AS buildContainer
RUN apk add -U --no-cache bash make curl
RUN apk add --no-cache --update gcc g++
jachym-tousek-keboola marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /app

COPY Makefile Makefile
Expand All @@ -15,7 +16,7 @@ COPY . .
RUN make build-stream-service

# Production container
FROM alpine:3.19
FROM alpine:3.20
RUN apk add -U --no-cache ca-certificates git

COPY --from=buildContainer /app/target/stream/service /app/service
Expand Down
2 changes: 1 addition & 1 deletion provisioning/templates-api/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY . .
RUN make build-templates-api

# Production container
FROM alpine:3.19
FROM alpine:3.20
RUN apk add -U --no-cache ca-certificates git

COPY --from=buildContainer /app/target/templates/api /app/server
Expand Down
Loading