Skip to content

Commit

Permalink
Merge pull request #16 from bringauto/BAF-763/fleet-protocol-package
Browse files Browse the repository at this point in the history 
BAF-796 fleet-http-client package
  • Loading branch information
@Melky-Phoe
Melky-Phoe authored Apr 2, 2024
2 parents 76afa6f + 183a323 commit 4a090a4
Show file tree
Hide file tree
Showing 11 changed files with 161 additions and 7 deletions.
2 changes: 1 addition & 1 deletion example/docker/debian11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 && \
build-essential binutils lsb-release make git libssl-dev openssh-server 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 && \
Expand Down
2 changes: 1 addition & 1 deletion example/docker/debian12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 && \
build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf && \
rm -rf /var/lib/apt/lists/*

RUN wget "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-linux-x86_64.sh" -O cmake.sh && \
Expand Down
2 changes: 1 addition & 1 deletion example/docker/fleet-os-2/Dockerfile
View file
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&& \
build-essential xz-utils sed git libssl-dev openssh-server wget unzip python3 make patchelf && \
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
2 changes: 1 addition & 1 deletion example/docker/ubuntu2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN echo root:1234 | chpasswd

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake make libssl-dev coreutils lsb-release wget g++-10 gcc-10 && \
build-essential make libssl-dev coreutils lsb-release wget g++-10 gcc-10 patchelf && \
rm -rf /var/lib/apt/lists/*

RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10
Expand Down
2 changes: 1 addition & 1 deletion example/docker/ubuntu2204/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 && \
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 && \
Expand Down
2 changes: 1 addition & 1 deletion example/docker/ubuntu2304/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 && \
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 && \
Expand Down
2 changes: 1 addition & 1 deletion example/docker/ubuntu2310/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 && \
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 && \
Expand Down
37 changes: 37 additions & 0 deletions example/package/cpprestsdk/cpprestsdk_debug.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"Env": { },
"DependsOn": [ "zlib", "boost" ],
"Git": {
"URI": "https://github.com/bringauto/cpprestsdk.git",
"Revision": "v2.10.20"
},
"Build": {
"CMake": {
"Defines": {
"CMAKE_BUILD_TYPE": "Debug",
"BUILD_TESTS": "OFF",
"BUILD_SAMPLES": "OFF"
}
}
},
"Package": {
"Name": "cpprestsdk",
"VersionTag": "v2.10.20",
"PlatformString": {
"Mode": "auto"
},
"IsLibrary": true,
"IsDevLib": true,
"IsDebug": true
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
]
}
}
37 changes: 37 additions & 0 deletions example/package/cpprestsdk/cpprestsdk_release.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"Env": { },
"DependsOn": [ "zlib", "boost" ],
"Git": {
"URI": "https://github.com/bringauto/cpprestsdk.git",
"Revision": "v2.10.20"
},
"Build": {
"CMake": {
"Defines": {
"CMAKE_BUILD_TYPE": "Release",
"BUILD_TESTS": "OFF",
"BUILD_SAMPLES": "OFF"
}
}
},
"Package": {
"Name": "cpprestsdk",
"VersionTag": "v2.10.20",
"PlatformString": {
"Mode": "auto"
},
"IsLibrary": true,
"IsDevLib": true,
"IsDebug": false
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
]
}
}
40 changes: 40 additions & 0 deletions example/package/fleet-http-client-shared/fleet_http_client_debug.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"Env": {},
"DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cpp", "cpprestsdk" ],
"Git": {
"URI": "https://github.com/bringauto/fleet-http-client.git",
"Revision": "v1.2.1"
},
"Build": {
"CMake": {
"Defines": {
"CMAKE_BUILD_TYPE": "Debug",
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_SAMPLES" : "OFF",
"BRINGAUTO_TESTS" : "OFF"
}
}
},
"Package": {
"Name": "fleet-http-client-shared",
"VersionTag": "v1.2.1",
"PlatformString": {
"Mode": "auto"
},
"IsLibrary": true,
"IsDevLib": true,
"IsDebug": true
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
]
}
}
40 changes: 40 additions & 0 deletions example/package/fleet-http-client-shared/fleet_http_client_release.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"Env": {},
"DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cpp", "cpprestsdk" ],
"Git": {
"URI": "https://github.com/bringauto/fleet-http-client.git",
"Revision": "v1.2.1"
},
"Build": {
"CMake": {
"Defines": {
"CMAKE_BUILD_TYPE": "Release",
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_SAMPLES" : "OFF",
"BRINGAUTO_TESTS" : "OFF"
}
}
},
"Package": {
"Name": "fleet-http-client-shared",
"VersionTag": "v1.2.1",
"PlatformString": {
"Mode": "auto"
},
"IsLibrary": true,
"IsDevLib": true,
"IsDebug": false
},
"DockerMatrix": {
"ImageNames": [
"ubuntu2004",
"ubuntu2204",
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
]
}
}

0 comments on commit 4a090a4

Please sign in to comment.