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

Remove system-probe images entrypoint #292

Merged
merged 13 commits into from
Feb 2, 2023
Merged

Remove system-probe images entrypoint #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86f74ce
sync comment
paulcacheux Oct 1, 2022
48f7810
install golang directly from download (without GIMME)
paulcacheux Oct 1, 2022
35d9308
remove sys-probe entrypoint
paulcacheux Oct 1, 2022
278f4e1
fix go install
paulcacheux Oct 1, 2022
c20d4df
cleanup go install
paulcacheux Oct 1, 2022
36f6642
fix
paulcacheux Oct 3, 2022
92522c5
fix omnibus image
paulcacheux Oct 3, 2022
f1eb587
wget -> curl
paulcacheux Oct 3, 2022
21d2503
2 spaces
paulcacheux Oct 3, 2022
b82fa5a
Revert omnibus changes
paulcacheux Nov 30, 2022
f36eff1
Fix system probe go sha256
paulcacheux Nov 30, 2022
9bba6a3
update sha256 for go downloads
paulcacheux Jan 26, 2023
2f100d0
cleanup `GIMME_GO_VERSION`
paulcacheux Jan 26, 2023
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
26 changes: 9 additions & 17 deletions system-probe_arm64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM debian:buster

ARG DEBIAN_FRONTEND=noninteractive
ARG GIMME_GO_VERSION=1.19.5
ARG GO_VERSION=1.19.5

ENV GIMME_GO_VERSION $GIMME_GO_VERSION
ENV GOPATH=/go

# We need up-to-date kernel headers to be able to use newly available eBPF helpers in programs
# We need up-to-date kernel headers to be able to use newly available eBPF helpers in programs.
RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee -a /etc/apt/sources.list

RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get dist-upgrade -y && apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -50,16 +47,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && ap
wget \
xz-utils

RUN wget -O /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/v1.5.4/gimme
RUN echo "03b295636d4e22870b6f6e9bc06a71d65311ae90d3d48cbc7071f82dd5837fbc /bin/gimme" | sha256sum --check
RUN chmod +x /bin/gimme
RUN gimme $GIMME_GO_VERSION
ENV GO_VERSION $GO_VERSION
ENV GOPATH=/go

RUN wget -O /tmp/golang.tar.gz https://go.dev/dl/go$GO_VERSION.linux-arm64.tar.gz \
&& echo "fc0aa29c933cec8d76f5435d859aaf42249aa08c74eb2d154689ae44c08d23b3 /tmp/golang.tar.gz" | sha256sum --check \
&& tar -C /usr/local -xzf /tmp/golang.tar.gz \
&& rm -f /tmp/golang.tar.gz
ENV PATH "/usr/local/go/bin:${PATH}"
ENV PATH "${GOPATH}/bin:${PATH}"

# create the agent build folder within $GOPATH
RUN mkdir -p $GOPATH/src/github.com/DataDog/datadog-agent

# install clang from the website since the package manager can change at any time
RUN wget "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang+llvm-12.0.1-aarch64-linux-gnu.tar.xz" -O /tmp/clang.tar.xz -o /dev/null
RUN echo "3d4ad804b7c85007686548cbc917ab067bf17eaedeab43d9eb83d3a683d8e9d4 /tmp/clang.tar.xz" | sha256sum --check
Expand All @@ -70,8 +67,3 @@ ENV PATH "/opt/clang/bin:${PATH}"
COPY ./requirements.txt /
RUN python3 -m pip install wheel
RUN python3 -m pip install -r requirements.txt

COPY ./entrypoint-sysprobe.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
24 changes: 8 additions & 16 deletions system-probe_x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
FROM debian:buster

ARG DEBIAN_FRONTEND=noninteractive
ARG GIMME_GO_VERSION=1.19.5

ENV GIMME_GO_VERSION $GIMME_GO_VERSION
ENV GOPATH=/go
ARG GO_VERSION=1.19.5

# We need up-to-date kernel headers to be able to use newly available eBPF helpers in programs.
RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee -a /etc/apt/sources.list
Expand Down Expand Up @@ -51,16 +48,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && ap
wget \
xz-utils

RUN wget -O /bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/v1.5.4/gimme
RUN echo "03b295636d4e22870b6f6e9bc06a71d65311ae90d3d48cbc7071f82dd5837fbc /bin/gimme" | sha256sum --check
RUN chmod +x /bin/gimme
RUN gimme $GIMME_GO_VERSION
ENV GO_VERSION $GO_VERSION
ENV GOPATH=/go

RUN wget -O /tmp/golang.tar.gz https://go.dev/dl/go$GO_VERSION.linux-amd64.tar.gz \
&& echo "36519702ae2fd573c9869461990ae550c8c0d955cd28d2827a6b159fda81ff95 /tmp/golang.tar.gz" | sha256sum --check \
&& tar -C /usr/local -xzf /tmp/golang.tar.gz \
&& rm -f /tmp/golang.tar.gz
ENV PATH "/usr/local/go/bin:${PATH}"
ENV PATH "${GOPATH}/bin:${PATH}"

# create the agent build folder within $GOPATH
RUN mkdir -p $GOPATH/src/github.com/DataDog/datadog-agent

# install clang from the website since the package manager can change at any time
RUN wget "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang+llvm-12.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz" -O /tmp/clang.tar.xz -o /dev/null
RUN echo "6b3cc55d3ef413be79785c4dc02828ab3bd6b887872b143e3091692fc6acefe7 /tmp/clang.tar.xz" | sha256sum --check
Expand All @@ -71,8 +68,3 @@ ENV PATH "/opt/clang/bin:${PATH}"
COPY ./requirements.txt /
RUN python3 -m pip install wheel
RUN python3 -m pip install -r requirements.txt

COPY ./entrypoint-sysprobe.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]