Skip to content

Commit 493bc1e

Browse files
sumeetchhetrisumeetchhetri
committed
Fixes for apache module
Fix for julia module Possible fix for pg-wire embedded [docker_verify]
1 parent a7d57ca commit 493bc1e

32 files changed

+373
-53
lines changed

‎.github/workflows/ci-ubuntu.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v2
2020
- name: Install dependencies
2121
run: |
22-
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format ninja-build libjsoncpp-dev libboost-all-dev libbson-dev libmongoc-dev
22+
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format ninja-build libjsoncpp-dev libboost-all-dev
2323
sudo apt remove -y libsqlite3-dev
2424
#sudo apt-get install libseccomp-dev
2525
#git clone https://github.com/opencontainers/runc
@@ -40,6 +40,19 @@ jobs:
4040
#cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
4141
#cd /tmp
4242
#rm -rf mongo-c-driver-1.4.2
43+
VERSION=1.26.2
44+
wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
45+
tar xf "mongo-c-driver-$VERSION.tar.gz"
46+
rm -f "mongo-c-driver-$VERSION.tar.gz"
47+
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
48+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
49+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
50+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
51+
-D BUILD_VERSION="$VERSION" \
52+
-D ENABLE_SSL=OFF \
53+
-D ENABLE_SASL=OFF \
54+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
55+
rm -rf "mongo-c-driver-$VERSION"
4356
wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
4457
tar xf v1.0.0.tar.gz
4558
rm -f v1.0.0.tar.gz

‎.github/workflows/codeql-analysis.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
# uses a compiled language
6666

6767
- run: |
68-
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format-11 ninja-build libjsoncpp-dev libjansson-dev libc-ares-dev libboost-all-dev libbson-dev libmongoc-dev
68+
sudo apt update -yqq && sudo apt install --no-install-recommends -yqq ninja-build libpq-dev libcurl4-openssl-dev autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make clang-format-11 ninja-build libjsoncpp-dev libjansson-dev libc-ares-dev libboost-all-dev
6969
pushd /tmp
7070
wget -q https://github.com/efficient/libcuckoo/archive/master.zip
7171
unzip master.zip
@@ -80,6 +80,19 @@ jobs:
8080
#cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
8181
#cd /tmp
8282
#rm -rf mongo-c-driver-1.4.2
83+
VERSION=1.26.2
84+
wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
85+
tar xf "mongo-c-driver-$VERSION.tar.gz"
86+
rm -f "mongo-c-driver-$VERSION.tar.gz"
87+
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
88+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
89+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
90+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
91+
-D BUILD_VERSION="$VERSION" \
92+
-D ENABLE_SSL=OFF \
93+
-D ENABLE_SASL=OFF \
94+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
95+
rm -rf "mongo-c-driver-$VERSION"
8396
wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
8497
tar xf v1.0.0.tar.gz
8598
rm -f v1.0.0.tar.gz

‎docker/all/benchmark_config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
"display_name": "ffead-cpp-apache",
281281
"notes": "apache mongo",
282282
"versus": "",
283-
"tags": ["broken"]
283+
"tags": []
284284
},
285285
"mysql": {
286286
"json_url": "/t1/j",
@@ -436,7 +436,7 @@
436436
"display_name": "ffead-cpp-rust-actix",
437437
"notes": "",
438438
"versus": "",
439-
"tags": ["broken"]
439+
"tags": []
440440
},
441441
"rust-rocket": {
442442
"json_url": "/t1/j",

‎docker/all/lang/ffead-cpp-julia-http.dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ RUN rm -f /usr/local/lib/libffead-* /usr/local/lib/libte_benc* /usr/local/lib/li
1111
ldconfig
1212

1313
WORKDIR ${IROOT}
14-
#RUN wget --no-check-certificate -q https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.2-linux-x86_64.tar.gz
15-
#RUN tar -xzf julia-1.5.2-linux-x86_64.tar.gz
16-
#RUN mv julia-1.5.2 /opt/
17-
#RUN rm -f julia-1.5.2-linux-x86_64.tar.gz
18-
#ENV PATH="/opt/julia-1.5.2/bin:${PATH}"
1914
RUN curl -fsSL https://install.julialang.org | sh -s -- -y --default-channel release
2015
ENV PATH="/root/.juliaup/bin:${PATH}"
2116
RUN juliaup default release
@@ -24,8 +19,10 @@ RUN julia -e 'import Pkg; Pkg.update()' && \
2419
julia -e 'import Pkg; Pkg.add("HTTP")' && \
2520
julia -e 'import Pkg; Pkg.precompile()'
2621

22+
COPY julia_curl_fix.sh /
23+
2724
WORKDIR /
2825

2926
RUN rm -f /root/.julia/juliaup/julia-1.10.0+0.x64.linux.gnu/lib/julia/libcurl.*
30-
RUN cp /usr/lib/x86_64-linux-gnu/libcurl.so* /root/.julia/juliaup/julia-1.10.0+0.x64.linux.gnu/lib/julia/
27+
RUN chmod +x julia_curl_fix.sh && ./julia_curl_fix.sh
3128
CMD ./run_ffead.sh ffead-cpp-7.0 julia-http

‎docker/all/scripts/install_ffead-cpp-dependencies.sh

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apt update -yqq && apt install --no-install-recommends -yqq autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev \
44
apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev lsb-release gnupg \
55
zlib1g-dev cmake make clang-format ninja-build libcurl4-openssl-dev git libpq-dev libpugixml-dev \
6-
wget build-essential pkg-config libpcre3-dev curl libgtk2.0-dev libgdk-pixbuf2.0-dev bison flex libreadline-dev libbson-dev libmongoc-dev
6+
wget build-essential pkg-config libpcre3-dev curl libgtk2.0-dev libgdk-pixbuf2.0-dev bison flex libreadline-dev
77
apt-get install --reinstall ca-certificates
88

99
wget -q https://repo.mysql.com/apt/ubuntu/pool/mysql-apt-config/m/mysql-apt-config/mysql-apt-config_0.8.29-1_all.deb
@@ -51,7 +51,21 @@ rm -rf libcuckoo
5151
# ./configure --disable-automatic-init-and-cleanup && \
5252
# make && make install
5353
#cd $IROOT
54-
#rm -rf mongo-c-driver-1.4.2
54+
#rm -rf mongo-c-driver-1.4.2
55+
MONGO_VERSION=1.26.2
56+
wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$MONGO_VERSION.tar.gz" --output-document="mongo-c-driver-$MONGO_VERSION.tar.gz"
57+
tar xf "mongo-c-driver-$MONGO_VERSION.tar.gz"
58+
rm -f "mongo-c-driver-$MONGO_VERSION.tar.gz"
59+
cd mongo-c-driver-$MONGO_VERSION/ && mkdir _build && cmake -S . -B _build \
60+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
61+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
62+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
63+
-D BUILD_VERSION="$MONGO_VERSION" \
64+
-D ENABLE_SSL=OFF \
65+
-D ENABLE_SASL=OFF \
66+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
67+
cd $IROOT
68+
rm -rf "mongo-c-driver-$MONGO_VERSION"
5569

5670
wget -q https://github.com/redis/hiredis/archive/v1.0.2.tar.gz
5771
tar xf v1.0.2.tar.gz

‎docker/all/scripts/julia_curl_fix.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
JUL_VER=`julia -version|cut -d" " -f 3`
4+
cp /usr/lib/x86_64-linux-gnu/libcurl.so* /root/.julia/juliaup/julia-${JUL_VER}+0.x64.linux.gnu/lib/julia/

‎docker/os-based/DockerFile-Almalinux-x64-ffead-cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN dnf config-manager --set-enabled crb
88
#RUN dnf config-manager --set-enabled remi
99
RUN dnf group install -y "Development Tools"
1010
RUN dnf install -y libmemcached-awesome libmemcached-awesome-devel
11-
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake mongo-c-driver-devel
11+
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake
1212

1313
#Install libcuckoo headers
1414
WORKDIR /tmp
@@ -45,6 +45,19 @@ RUN rm -rf redis-plus-plus-1.3.10
4545
#RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup --disable-tests --disable-ssl --disable-sasl && make && make install
4646
#WORKDIR /tmp
4747
#RUN rm -rf mongo-c-driver-1.4.2
48+
ENV VERSION=1.26.2
49+
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
50+
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
51+
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
52+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
53+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
54+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
55+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
56+
-D BUILD_VERSION="$VERSION" \
57+
-D ENABLE_SSL=OFF \
58+
-D ENABLE_SASL=OFF \
59+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
60+
RUN rm -rf "mongo-c-driver-$VERSION"
4861

4962
#Install ffead-cpp
5063
WORKDIR /tmp

‎docker/os-based/DockerFile-Almalinux-x64-ffead-cpp_autoconf

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN dnf config-manager --set-enabled crb
88
RUN dnf config-manager --set-enabled remi
99
RUN dnf group install -y "Development Tools"
1010
RUN dnf install -y libmemcached-awesome libmemcached-awesome-devel
11-
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake mongo-c-driver-devel
11+
RUN yum update -yqq && yum install -y --nogpgcheck --allowerasing procps unzip tar autoconf automake libtool postgresql-devel libcurl libcurl-devel openssl openssl-devel libuuid-devel zlib zlib-devel unixODBC* tar gzip wget nmap-ncat cmake
1212

1313
#Install libcuckoo headers
1414
WORKDIR /tmp
@@ -45,6 +45,19 @@ RUN rm -rf redis-plus-plus-1.3.10
4545
#RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup --disable-tests --disable-ssl --disable-sasl && make && make install
4646
#WORKDIR /tmp
4747
#RUN rm -rf mongo-c-driver-1.4.2
48+
ENV VERSION=1.26.2
49+
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
50+
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
51+
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
52+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
53+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
54+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
55+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
56+
-D BUILD_VERSION="$VERSION" \
57+
-D ENABLE_SSL=OFF \
58+
-D ENABLE_SASL=OFF \
59+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
60+
RUN rm -rf "mongo-c-driver-$VERSION"
4861

4962
#Install ffead-cpp
5063
WORKDIR /tmp

‎docker/os-based/DockerFile-Alpine-x64-ffead-cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:latest
22

3-
RUN apk add autoconf-archive autoconf automake libtool gcc g++ make cmake unzip postgresql-dev openssl openssl-dev psqlodbc unixodbc unixodbc-dev curl-dev libmemcached libmemcached-dev wget netcat-openbsd bash mongo-c-driver-dev
3+
RUN apk add autoconf-archive autoconf automake libtool gcc g++ make cmake unzip postgresql-dev openssl openssl-dev psqlodbc unixodbc unixodbc-dev curl-dev libmemcached libmemcached-dev wget netcat-openbsd bash
44
RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing ossp-uuid-dev
55

66
#Install libcuckoo headers
@@ -21,6 +21,19 @@ RUN rm -rf /tmp/libcuckoo-master
2121
#RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && make install
2222
#WORKDIR /tmp
2323
#RUN rm -rf mongo-c-driver-1.4.2
24+
ENV VERSION=1.26.2
25+
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
26+
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
27+
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
28+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
29+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
30+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
31+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
32+
-D BUILD_VERSION="$VERSION" \
33+
-D ENABLE_SSL=OFF \
34+
-D ENABLE_SASL=OFF \
35+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
36+
RUN rm -rf "mongo-c-driver-$VERSION"
2437

2538
RUN wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
2639
RUN tar xf v1.0.0.tar.gz

‎docker/os-based/DockerFile-Alpine-x64-ffead-cpp_autoconf

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:latest
22

3-
RUN apk add autoconf-archive autoconf automake libtool gcc g++ make cmake unzip postgresql-dev openssl openssl-dev psqlodbc unixodbc unixodbc-dev curl-dev libmemcached libmemcached-dev wget netcat-openbsd bash mongo-c-driver-dev
3+
RUN apk add autoconf-archive autoconf automake libtool gcc g++ make cmake unzip postgresql-dev openssl openssl-dev psqlodbc unixodbc unixodbc-dev curl-dev libmemcached libmemcached-dev wget netcat-openbsd bash
44
RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing ossp-uuid-dev
55

66
#Install libcuckoo headers
@@ -21,6 +21,19 @@ RUN rm -rf /tmp/libcuckoo-master
2121
#RUN cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && make install
2222
#WORKDIR /tmp
2323
#RUN rm -rf mongo-c-driver-1.4.2
24+
ENV VERSION=1.26.2
25+
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
26+
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
27+
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
28+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
29+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
30+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
31+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
32+
-D BUILD_VERSION="$VERSION" \
33+
-D ENABLE_SSL=OFF \
34+
-D ENABLE_SASL=OFF \
35+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
36+
RUN rm -rf "mongo-c-driver-$VERSION"
2437

2538
RUN wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
2639
RUN tar xf v1.0.0.tar.gz

0 commit comments

Comments
 (0)