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

ci: correct batch etl images #3099

Merged
merged 1 commit into from
Jan 10, 2025
+4 −5
Merged

ci: correct batch etl images #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions batch-etl/Dockerfile.check-completion-worker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# it will be cached from the second build onwards
RUN apt-get update -y && apt-get -y install pkg-config libssl-dev libpq-dev g++ curl
RUN cargo install cargo-chef
WORKDIR app
WORKDIR /app

FROM chef AS planner
COPY . .
Expand All @@ -17,10 +17,10 @@
COPY . .
RUN cargo build --release --features "runtime-env" --bin "check-completion-worker"

FROM debian:bookworm-slim as runtime

Check warning on line 20 in batch-etl/Dockerfile.check-completion-worker

View workflow job for this annotation

GitHub Actions / Push Check Completion worker (blacksmith-8vcpu-ubuntu-2204, linux/amd64, latest)

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
RUN apt-get update -y && apt-get -y install pkg-config libssl-dev libpq-dev ca-certificates
WORKDIR /app
COPY ./migrations/ /app/migrations
COPY ./ch_migrations/ /app/ch_migrations
COPY --from=builder /app/target/release/check-completion-worker /app/check-completion-worker


Expand Down
4 changes: 2 additions & 2 deletions batch-etl/Dockerfile.create-job-worker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# it will be cached from the second build onwards
RUN apt-get update -y && apt-get -y install pkg-config libssl-dev libpq-dev g++ curl
RUN cargo install cargo-chef
WORKDIR app
WORKDIR /app

FROM chef AS planner
COPY . .
Expand All @@ -17,10 +17,10 @@
COPY . .
RUN cargo build --release --features "runtime-env" --bin "create-job-worker"

FROM debian:bookworm-slim as runtime

Check warning on line 20 in batch-etl/Dockerfile.create-job-worker

View workflow job for this annotation

GitHub Actions / Push Create Job image (blacksmith-8vcpu-ubuntu-2204, linux/amd64, latest)

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
RUN apt-get update -y && apt-get -y install pkg-config libssl-dev libpq-dev ca-certificates
WORKDIR /app
COPY ./migrations/ /app/migrations
COPY ./ch_migrations/ /app/ch_migrations
COPY --from=builder /app/target/release/create-job-worker /app/create-job-worker


Expand Down
1 change: 0 additions & 1 deletion batch-etl/Dockerfile.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ RUN apt-get update -y; \
;

COPY ./ch_migrations /app/ch_migrations
COPY --from=builder /app/static /app/static
COPY --from=builder /app/target/release/batch-etl-server /app/batch-etl-server

EXPOSE 8090
Expand Down