Skip to content

Docker fixup #375

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

Merged
florianl merged 2 commits into from
Feb 28, 2025
+10 −10
Merged

Docker fixup #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e5a72b
Makefile: update tag in docker-image
florianl Feb 27, 2025
1883063
Docker: add missing dependencies
florianl Feb 27, 2025
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
18 changes: 9 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ RUN cross_debian_arch=$(uname -m | sed -e 's/aarch64/amd64/' -e 's/x86_64/arm64
cross_pkg_arch=$(uname -m | sed -e 's/aarch64/x86-64/' -e 's/x86_64/aarch64/'); \
apt-get update -y && \
apt-get dist-upgrade -y && \
apt-get install -y curl wget make git clang-17 unzip libc6-dev g++ gcc pkgconf \
gcc-${cross_pkg_arch}-linux-gnu libc6-${cross_debian_arch}-cross && \
apt-get install -y curl wget make git cmake clang-17 unzip libc6-dev g++ gcc pkgconf \
gcc-${cross_pkg_arch}-linux-gnu libc6-${cross_debian_arch}-cross musl-dev && \
apt-get clean autoclean && \
apt-get autoremove --yes

Expand Down Expand Up @@ -44,8 +44,7 @@ RUN
RUN echo 'export PATH="/usr/local/go/bin:$PATH"' >> /etc/profile

# Create rust related directories in /usr/local
RUN mkdir -p /usr/local/cargo
RUN mkdir -p /usr/local/rustup
RUN mkdir -p /usr/local/cargo /usr/local/rustup

# Set environment variable before rustup installation
ENV CARGO_HOME=/usr/local/cargo
Expand All @@ -55,11 +54,12 @@ ENV RUSTUP_HOME=/usr/local/rustup
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain 1.77

# Add rust related environment variables
RUN echo 'export PATH="/usr/local/cargo/bin:$PATH"' >> /etc/profile
RUN echo 'export CARGO_HOME="/usr/local/cargo"' >> /etc/profile
RUN echo 'export RUSTUP_HOME="/usr/local/rustup"' >> /etc/profile
RUN echo 'export PATH="/usr/local/cargo/bin:$PATH"' >> /etc/profile \
&& echo 'export CARGO_HOME="/usr/local/cargo"' >> /etc/profile \
&& echo 'export RUSTUP_HOME="/usr/local/rustup"' >> /etc/profile

# Set mode bits for rustup
RUN chmod -R a+w /usr/local/rustup
# Set mode bits
RUN chmod -R a+w /usr/local/rustup \
&& chmod -R a+w /usr/local/cargo
Comment on lines +62 to +63
Copy link
Copy Markdown
Contributor

@rockdaboot rockdaboot Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RUN chmod -R a+w /usr/local/rustup \
&& chmod -R a+w /usr/local/cargo
RUN chmod -R a+w /usr/local/rustup /usr/local/cargo


ENTRYPOINT ["/bin/bash", "-l", "-c"]
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ integration-test-binaries: generate ebpf
)

docker-image:
docker build -t profiling-agent -f Dockerfile .
docker build -t otel/opentelemetry-ebpf-profiler-dev -f Dockerfile .

agent:
docker run -v "$$PWD":/agent -it --rm --user $(shell id -u):$(shell id -g) otel/opentelemetry-ebpf-profiler-dev:latest \
Expand Down