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

Ubuntu24 packages #26

Closed
wants to merge 3 commits into from
Closed
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
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 && \
build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf software-properties-common flex && \
rm -rf /var/lib/apt/lists/*

RUN git clone --depth=1 --single-branch --branch=releases/gcc-13.3.0 git://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
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 @@ -4,9 +4,14 @@ 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
27 changes: 0 additions & 27 deletions example/docker/ubuntu2310/Dockerfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
FROM ubuntu:23.04
FROM ubuntu:24.04

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 && \
coreutils lsb-release build-essential openssh-server git libssl-dev patchelf cmake && \
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 && \
chmod +x cmake.sh && \
Melky-Phoe marked this conversation as resolved.
Show resolved Hide resolved
./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 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"]
11 changes: 4 additions & 7 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,9 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
}
11 changes: 4 additions & 7 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,9 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
}
11 changes: 4 additions & 7 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,10 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"fleet-os-2",
"debian11",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
}
11 changes: 4 additions & 7 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,10 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"fleet-os-2",
"debian11",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
}
5 changes: 1 addition & 4 deletions example/package/bzip2/bzip2_debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"fleet-os-2",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
5 changes: 1 addition & 4 deletions example/package/bzip2/bzip2_release.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"debian11",
"fleet-os-2",
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
8 changes: 3 additions & 5 deletions example/package/cpprestsdk/cpprestsdk_debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"Defines": {
"CMAKE_BUILD_TYPE": "Debug",
"BUILD_TESTS": "OFF",
"BUILD_SAMPLES": "OFF"
"BUILD_SAMPLES": "OFF",
"CPPREST_EXCLUDE_WEBSOCKETS": "ON"
}
}
},
Expand All @@ -26,12 +27,9 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
8 changes: 3 additions & 5 deletions example/package/cpprestsdk/cpprestsdk_release.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"Defines": {
"CMAKE_BUILD_TYPE": "Release",
"BUILD_TESTS": "OFF",
"BUILD_SAMPLES": "OFF"
"BUILD_SAMPLES": "OFF",
"CPPREST_EXCLUDE_WEBSOCKETS": "ON"
MarioIvancik marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
Expand All @@ -26,12 +27,9 @@
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
5 changes: 1 addition & 4 deletions example/package/curl/curl_debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@
"DockerMatrix": {
"ImageNames": [
"ubuntu2204",
"ubuntu2004",
"debian11",
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2404"
]
}
}
Loading
Loading