diff --git a/Dockerfile b/Dockerfile index dff770c..713fc99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,6 @@ FROM python:3.11.8-bookworm AS builder RUN apt-get update && apt-get install -y apt-transport-https curl gnupg \ - && curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >/usr/share/keyrings/bazel-archive-keyring.gpg \ - && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \ - && apt-get update && apt-get install -y bazel-7.0.2 \ && rm -rf /var/lib/apt/lists/* WORKDIR /wgkex @@ -11,15 +8,18 @@ WORKDIR /wgkex COPY BUILD WORKSPACE requirements.txt ./ COPY wgkex ./wgkex -RUN ["bazel-7.0.2", "build", "//wgkex/broker:app"] -RUN ["bazel-7.0.2", "build", "//wgkex/worker:app"] -RUN ["cp", "-rL", "bazel-bin", "bazel-7.0.2"] +RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 && chmod +x bazelisk-linux-amd64 +ENV BAZELISK_CLEAN=true +ENV USE_BAZEL_VERSION=7.1.1rc2 +RUN ["./bazelisk-linux-amd64", "build", "//wgkex/broker:app"] +RUN ["./bazelisk-linux-amd64", "build", "//wgkex/worker:app"] +RUN ["cp", "-rL", "bazel-bin", "bazel"] FROM python:3.11.8-slim-bookworm WORKDIR /wgkex -COPY --from=builder /wgkex/bazel-7.0.2 /wgkex/ +COPY --from=builder /wgkex/bazel /wgkex/ COPY entrypoint /entrypoint