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

Fixes to get docker to build in arm64 #411

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Fixes to get docker to build in arm64 #411

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
6 changes: 4 additions & 2 deletions DEVELOPING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

## Table of Contents

- [Table of Contents](#table-of-contents)
- [Environment](#environment)
- [Workflow](#workflow)
- [CI/CD](#ci-cd)
- [CI/CD](#cicd)
- [Next Steps](#next-steps)

## Environment

Expand Down Expand Up @@ -36,7 +38,7 @@ To bring up a development environment:
(cd beluga && ROSDISTRO=humble docker/run.sh)
```

Supported distributions include `noetic`, `humble`, `iron`, and `rolling`.
Supported distributions include `noetic`, `humble`, `iron`, `jazzy`, and `rolling`.

## Workflow

Expand Down
7 changes: 4 additions & 3 deletions docker/images/humble/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ RUN apt-get update \
gdb \
git \
lcov \
linux-cloud-tools-generic \
linux-tools-common \
linux-tools-generic \
python3-colcon-coveragepy-result \
Expand Down Expand Up @@ -73,11 +72,13 @@ RUN addgroup --gid 1000 $GROUP \
&& echo "$USER ALL=NOPASSWD: ALL" >> /etc/sudoers.d/$USER

COPY docker/files/fixuid_config.yml /etc/fixuid/config.yml
RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.4-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - \
RUN /bin/bash -c '\
ARCH=`uname -m` && if [ "$ARCH" == "aarch64" ]; then FIXUID_ARCH="arm64"; else FIXUID_ARCH="amd64"; fi \
&& curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$FIXUID_ARCH.tar.gz | tar -C /usr/local/bin -xzf - \
&& chmod 4755 /usr/local/bin/fixuid \
&& cd /etc/fixuid \
&& sed -i "s/_USER_/$USER/" config.yml \
&& sed -i "s/_GROUP_/$GROUP/" config.yml
&& sed -i "s/_GROUP_/$GROUP/" config.yml'

RUN cd /opt && git clone https://github.com/brendangregg/FlameGraph

Expand Down
7 changes: 4 additions & 3 deletions docker/images/iron/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ RUN apt-get update \
gdb \
git \
lcov \
linux-cloud-tools-generic \
linux-tools-common \
linux-tools-generic \
python3-colcon-coveragepy-result \
Expand Down Expand Up @@ -73,11 +72,13 @@ RUN addgroup --gid 1000 $GROUP \
&& echo "$USER ALL=NOPASSWD: ALL" >> /etc/sudoers.d/$USER

COPY docker/files/fixuid_config.yml /etc/fixuid/config.yml
RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.4-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - \
RUN /bin/bash -c '\
ARCH=`uname -m` && if [ "$ARCH" == "aarch64" ]; then FIXUID_ARCH="arm64"; else FIXUID_ARCH="amd64"; fi \
&& curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$FIXUID_ARCH.tar.gz | tar -C /usr/local/bin -xzf - \
&& chmod 4755 /usr/local/bin/fixuid \
&& cd /etc/fixuid \
&& sed -i "s/_USER_/$USER/" config.yml \
&& sed -i "s/_GROUP_/$GROUP/" config.yml
&& sed -i "s/_GROUP_/$GROUP/" config.yml'

RUN cd /opt && git clone https://github.com/brendangregg/FlameGraph

Expand Down
7 changes: 4 additions & 3 deletions docker/images/jazzy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ RUN apt-get update \
gdb \
git \
lcov \
linux-cloud-tools-generic \
linux-tools-common \
linux-tools-generic \
python3-colcon-coveragepy-result \
Expand Down Expand Up @@ -74,11 +73,13 @@ RUN addgroup --gid 1001 $GROUP \
&& echo "$USER ALL=NOPASSWD: ALL" >> /etc/sudoers.d/$USER

COPY docker/files/fixuid_config.yml /etc/fixuid/config.yml
RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.4-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - \
RUN /bin/bash -c '\
ARCH=`uname -m` && if [ "$ARCH" == "aarch64" ]; then FIXUID_ARCH="arm64"; else FIXUID_ARCH="amd64"; fi \
&& curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$FIXUID_ARCH.tar.gz | tar -C /usr/local/bin -xzf - \
&& chmod 4755 /usr/local/bin/fixuid \
&& cd /etc/fixuid \
&& sed -i "s/_USER_/$USER/" config.yml \
&& sed -i "s/_GROUP_/$GROUP/" config.yml
&& sed -i "s/_GROUP_/$GROUP/" config.yml'

RUN cd /opt && git clone https://github.com/brendangregg/FlameGraph

Expand Down
6 changes: 4 additions & 2 deletions docker/images/noetic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ RUN addgroup --gid 1000 $GROUP \
&& echo "$USER ALL=NOPASSWD: ALL" >> /etc/sudoers.d/$USER

COPY docker/files/fixuid_config.yml /etc/fixuid/config.yml
RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.4-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - \
RUN /bin/bash -c '\
ARCH=`uname -m` && if [ "$ARCH" == "aarch64" ]; then FIXUID_ARCH="arm64"; else FIXUID_ARCH="amd64"; fi \
&& curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$FIXUID_ARCH.tar.gz | tar -C /usr/local/bin -xzf - \
&& chmod 4755 /usr/local/bin/fixuid \
&& cd /etc/fixuid \
&& sed -i "s/_USER_/$USER/" config.yml \
&& sed -i "s/_GROUP_/$GROUP/" config.yml
&& sed -i "s/_GROUP_/$GROUP/" config.yml'

RUN cd /opt && git clone https://github.com/brendangregg/FlameGraph

Expand Down
7 changes: 4 additions & 3 deletions docker/images/rolling/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ RUN apt-get update \
gdb \
git \
lcov \
linux-cloud-tools-generic \
linux-tools-common \
linux-tools-generic \
python3-colcon-coveragepy-result \
Expand Down Expand Up @@ -74,11 +73,13 @@ RUN addgroup --gid 1001 $GROUP \
&& echo "$USER ALL=NOPASSWD: ALL" >> /etc/sudoers.d/$USER

COPY docker/files/fixuid_config.yml /etc/fixuid/config.yml
RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.4-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - \
RUN /bin/bash -c '\
ARCH=`uname -m` && if [ "$ARCH" == "aarch64" ]; then FIXUID_ARCH="arm64"; else FIXUID_ARCH="amd64"; fi \
&& curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$FIXUID_ARCH.tar.gz | tar -C /usr/local/bin -xzf - \
&& chmod 4755 /usr/local/bin/fixuid \
&& cd /etc/fixuid \
&& sed -i "s/_USER_/$USER/" config.yml \
&& sed -i "s/_GROUP_/$GROUP/" config.yml
&& sed -i "s/_GROUP_/$GROUP/" config.yml'

RUN cd /opt && git clone https://github.com/brendangregg/FlameGraph

Expand Down
Loading