mirror of
https://github.com/trailofbits/buttercup
synced 2026-06-21 14:11:39 +00:00
deployment: pin Docker version to be consistent
Without this, the various components would use a more up-to-date docker version that is not compatible with the version of dind 24.0 that was used.
This commit is contained in:
committed by
Riccardo Schirone
parent
3f694a8c46
commit
ab27eb2fab
@@ -22,7 +22,7 @@ spec:
|
||||
- "ghcr.io"
|
||||
containers:
|
||||
- name: dind
|
||||
image: "docker:24.0.6-dind"
|
||||
image: "docker:29.0.0-dind"
|
||||
securityContext:
|
||||
privileged: true
|
||||
resources:
|
||||
@@ -72,4 +72,4 @@ spec:
|
||||
secret:
|
||||
secretName: registry-cache-tls
|
||||
{{- include "buttercup.dockerSocketVolume" . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
@@ -31,7 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
|
||||
apt-get install -y git curl && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN curl -fsSL https://get.docker.com | sh
|
||||
RUN for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do DEBIAN_FRONTEND=noninteractive apt-get remove $pkg; done || true
|
||||
RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --version 29.0
|
||||
|
||||
COPY --from=builder --chown=app:app /app/orchestrator/.venv /app/orchestrator/.venv
|
||||
WORKDIR /app/orchestrator
|
||||
|
||||
+2
-1
@@ -14,7 +14,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
|
||||
libncurses-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN curl -fsSL https://get.docker.com | sh
|
||||
RUN for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do DEBIAN_FRONTEND=noninteractive apt-get remove $pkg; done || true
|
||||
RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --version 29.0
|
||||
|
||||
|
||||
FROM python_base AS builder
|
||||
|
||||
@@ -5,7 +5,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y software
|
||||
&& add-apt-repository ppa:deadsnakes/ppa \
|
||||
&& apt-get update && apt-get install -y python3.12 curl \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
RUN curl -fsSL https://get.docker.com | sh
|
||||
RUN for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do DEBIAN_FRONTEND=noninteractive apt-get remove $pkg; done || true
|
||||
RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --version 29.0
|
||||
|
||||
FROM base AS builder
|
||||
COPY --from=ghcr.io/astral-sh/uv:0.5.20 /uv /uvx /bin/
|
||||
|
||||
+2
-1
@@ -8,7 +8,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
|
||||
FROM python_base AS runtime-base
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y curl ripgrep codequery
|
||||
RUN curl -fsSL https://get.docker.com | sh
|
||||
RUN for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do DEBIAN_FRONTEND=noninteractive apt-get remove $pkg; done || true
|
||||
RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --version 29.0
|
||||
RUN curl -fsSLO https://github.com/vmware-labs/webassembly-language-runtimes/releases/download/python%2F3.12.0%2B20231211-040d5a6/python-3.12.0.wasm
|
||||
|
||||
RUN rm -rf /var/lib/apt/lists/*
|
||||
|
||||
Reference in New Issue
Block a user