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.

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

Add Fedora 36 to CI #1828

Merged
merged 1 commit into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ jobs:
container: mavsdk/mavsdk-${{ matrix.container_name }}
strategy:
matrix:
container_name: [fedora-34, fedora-35]
container_name: [fedora-34, fedora-35, fedora-36]
steps:
- uses: actions/checkout@v2
with:
Expand Down
56 changes: 56 additions & 0 deletions docker/Dockerfile-Fedora-36
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# Development environment for the MAVSDK based on Fedora 36.
#
# Author: Julian Oes <julian@oes.ch>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Debatable...

#

FROM fedora:36

MAINTAINER Julian Oes <julian@oes.ch>
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤷‍♂️


RUN dnf -y install \
autoconf \
automake \
ccache \
clang \
cmake \
colordiff \
doxygen \
gcc \
gcc-c++ \
git \
golang \
libcurl-devel \
libtool \
make \
ninja-build \
perl-FindBin \
python \
python-future \
redhat-rpm-config \
rpm-build \
ruby-devel \
rubygems \
sudo \
tinyxml2-devel \
wget \
which \
zlib-devel \
&& dnf clean all

RUN gem install --no-document fpm;

RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \
cd su-exec-* && make && mv su-exec /usr/local/bin && cd .. && rm -rf su-exec-*

# Create user with id 1001 (Jenkins docker workflow default)
RUN useradd --shell /bin/bash -u 1001 -c "" -m user

ADD /sudoers.txt /etc/sudoers
RUN chmod 440 /etc/sudoers

COPY entrypoint.sh /usr/local/bin/entrypoint.sh

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

WORKDIR "/home/user/MAVSDK"
2 changes: 2 additions & 0 deletions docker/build_and_push_docker_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ fi

$DOCKER_CMD build -f Dockerfile-Fedora-34 -t mavsdk/mavsdk-fedora-34 .
$DOCKER_CMD build -f Dockerfile-Fedora-35 -t mavsdk/mavsdk-fedora-35 .
$DOCKER_CMD build -f Dockerfile-Fedora-36 -t mavsdk/mavsdk-fedora-36 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04 -t mavsdk/mavsdk-ubuntu-20.04 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12 .
Expand All @@ -25,6 +26,7 @@ $DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-custom -t mavsdk/mavsdk-do

$DOCKER_CMD push mavsdk/mavsdk-fedora-34:latest
$DOCKER_CMD push mavsdk/mavsdk-fedora-35:latest
$DOCKER_CMD push mavsdk/mavsdk-fedora-36:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12:latest
Expand Down