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 fedora40 dockerfile and to build matrix #27

Merged
merged 12 commits into from
Sep 26, 2024
2 changes: 1 addition & 1 deletion example/add_docker_to_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
shopt -s nullglob
for package_json in $(find . -name '*.json')
do
jq '.DockerMatrix.ImageNames += [ "ubuntu2310" ]' ${package_json} > ${package_json}.test
jq '.DockerMatrix.ImageNames += [ "fedora40" ]' ${package_json} > ${package_json}.test
mv ${package_json}.test ${package_json}
done
shopt -u nullglob
27 changes: 0 additions & 27 deletions example/docker/debian11/Dockerfile

This file was deleted.

17 changes: 15 additions & 2 deletions example/docker/debian12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,19 @@ RUN echo root:1234 | chpasswd

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf && \
binutils build-essential flex git libssl-dev lsb-release make openssh-server patchelf software-properties-common wget && \
rm -rf /var/lib/apt/lists/*

RUN git clone --depth=1 --single-branch --branch=releases/gcc-13.2.0 https://gcc.gnu.org/git/gcc.git /gcc && \
cd /gcc && \
contrib/download_prerequisites && \
mkdir objdir

RUN cd /gcc/objdir && \
../configure --enable-languages=c,c++ --disable-multilib && \
make -j$(nproc) && \
make install

RUN wget "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-linux-x86_64.sh" -O cmake.sh && \
chmod +x cmake.sh && \
./cmake.sh --skip-license --prefix=/usr/local && \
Expand All @@ -19,7 +29,10 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*

RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc
RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc && \
echo "export CC=/usr/local/bin/gcc" >> /root/.bashrc && \
echo "export CXX=/usr/local/bin/g++" >> /root/.bashrc && \
echo "export LD_LIBRARY_PATH=/usr/local/lib64" >> /root/.bashrc

RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
RUN mkdir -p /run/sshd
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
FROM ubuntu:23.10
FROM fedora:40

USER root
RUN echo root:1234 | chpasswd

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
coreutils lsb-release build-essential openssh-server git libssl-dev wget patchelf && \
rm -rf /var/lib/apt/lists/*
RUN dnf -y update && \
dnf -y install \
automake binutils gcc gcc-c++ git kernel-devel lsb-release make openssh-server openssl-devel patchelf wget \
&& dnf clean all

RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
RUN wget "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" -O cmake.sh && \
chmod +x cmake.sh && \
./cmake.sh --skip-license --prefix=/usr/local && \
rm ./cmake.sh

RUN apt-get update && \
apt-get purge -y \
wget && \
rm -rf /var/lib/apt/lists/*
RUN dnf -y update && \
dnf -y remove \
wget

RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc

RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
RUN mkdir -p /run/sshd

RUN ssh-keygen -A

ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
2 changes: 1 addition & 1 deletion example/docker/fleet-os-2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN echo root:1234 | chpasswd
#
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential xz-utils sed git libssl-dev openssh-server wget unzip python3 make patchelf && \
build-essential xz-utils sed git libssl-dev openssh-server unzip python3 make patchelf wget && \
rm -rf /var/lib/apt/lists/*

RUN wget "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" -O cmake.sh && \
Expand Down
34 changes: 0 additions & 34 deletions example/docker/ubuntu2004/Dockerfile

This file was deleted.

9 changes: 7 additions & 2 deletions example/docker/ubuntu2204/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ FROM ubuntu:22.04
USER root
RUN echo root:1234 | chpasswd

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \
add-apt-repository ppa:ubuntu-toolchain-r/test

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
coreutils lsb-release build-essential openssh-server git libssl-dev wget patchelf && \
rm -rf /var/lib/apt/lists/*
coreutils lsb-release build-essential openssh-server git libssl-dev wget gcc-13 g++-13 patchelf && \
rm -rf /var/lib/apt/lists/* && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13

RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
chmod +x cmake.sh && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:23.04
FROM ubuntu:24.04

USER root
RUN echo root:1234 | chpasswd
Expand All @@ -8,20 +8,19 @@ RUN apt-get update && \
coreutils lsb-release build-essential openssh-server git libssl-dev wget patchelf && \
rm -rf /var/lib/apt/lists/*

RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
RUN wget "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" -O cmake.sh && \
chmod +x cmake.sh && \
./cmake.sh --skip-license --prefix=/usr/local && \
rm ./cmake.sh

RUN apt-get update && \
apt-get purge -y \
wget && \
rm -rf /var/lib/apt/lists/*
rm ./cmake.sh

RUN apt-get purge -y \
wget && \
rm -rf /var/lib/apt/lists/*

RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc

RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
RUN mkdir -p /run/sshd

ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
10 changes: 4 additions & 6 deletions example/package/ba-logger/ba-logger_debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
],
"Git": {
"URI": "https://github.com/bringauto/ba-logger.git",
"Revision": "v1.2.0"
"Revision": "v2.0.0"
},
"Build": {
"CMake": {
Expand All @@ -19,7 +19,7 @@
},
"Package": {
"Name": "ba-logger",
"VersionTag": "v1.2.0",
"VersionTag": "v2.0.0",
"PlatformString": {
"Mode": "auto"
},
Expand All @@ -29,12 +29,10 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404",
"fedora40"
]
}
}
10 changes: 4 additions & 6 deletions example/package/ba-logger/ba-logger_release.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
],
"Git": {
"URI": "https://github.com/bringauto/ba-logger.git",
"Revision": "v1.2.0"
"Revision": "v2.0.0"
},
"Build": {
"CMake": {
Expand All @@ -19,7 +19,7 @@
},
"Package": {
"Name": "ba-logger",
"VersionTag": "v1.2.0",
"VersionTag": "v2.0.0",
"PlatformString": {
"Mode": "auto"
},
Expand All @@ -29,12 +29,10 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404",
"fedora40"
]
}
}
10 changes: 4 additions & 6 deletions example/package/boost/boost_debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"CMake": {
"Defines": {
"CMAKE_BUILD_TYPE": "Debug",
"BOOST_VERSION": "1.78.0"
"BOOST_VERSION": "1.86.0"
}
}
},
"Package": {
"Name": "boost",
"VersionTag": "v1.78.0",
"VersionTag": "v1.86.0",
"PlatformString": {
"Mode": "auto"
},
Expand All @@ -25,13 +25,11 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"fleet-os-2",
"debian11",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404",
"fedora40"
]
}
}
10 changes: 4 additions & 6 deletions example/package/boost/boost_release.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"CMake": {
"Defines": {
"CMAKE_BUILD_TYPE": "Release",
"BOOST_VERSION": "1.78.0"
"BOOST_VERSION": "1.86.0"
}
}
},
"Package": {
"Name": "boost",
"VersionTag": "v1.78.0",
"VersionTag": "v1.86.0",
"PlatformString": {
"Mode": "auto"
},
Expand All @@ -25,13 +25,11 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"fleet-os-2",
"debian11",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404",
"fedora40"
]
}
}
6 changes: 2 additions & 4 deletions example/package/bzip2/bzip2_debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"fleet-os-2",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404",
"fedora40"
]
}
}
6 changes: 2 additions & 4 deletions example/package/bzip2/bzip2_release.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"fleet-os-2",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404",
"fedora40"
]
}
}
Loading
Loading