Skip to content

Commit ebe0d82

Browse files
sumeetchhetrisumeetchhetri
committed
Archlinux base-devel has devel libs already, skip updated curl as it breaks due to dep-openssl-3.3
[docker_verify]
1 parent ad4270b commit ebe0d82

File tree

3 files changed

+21
-27
lines changed

3 files changed

+21
-27
lines changed

‎.github/workflows/ci-macos.yml

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
#brew unlink bazel
26-
brew install libpq openssl@1.1 ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja mongo-c-driver
27-
if [ -f /usr/local/lib/libssl.dylib ]; then
28-
sudo mv /usr/local/lib/libssl.dylib /usr/local/lib/libssl_bak.dylib
29-
fi
30-
if [ -f /usr/local/lib/libcrypto.dylib ]; then
31-
sudo mv /usr/local/lib/libcrypto.dylib /usr/local/lib/libcrypto_bak.dylib
32-
fi
33-
if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib ]; then
34-
sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib /usr/local/lib/libssl.dylib
35-
fi
36-
if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib ]; then
37-
sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib /usr/local/lib/libcrypto.dylib
38-
fi
39-
if [ -d /usr/local/include/openssl ]; then
40-
sudo mv /usr/local/include/openssl /usr/local/include/openssl_bak
41-
fi
42-
if [ -d /usr/local/Cellar/openssl@1.1/1.1.1g/include ]; then
43-
sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/include /usr/local/include/openssl
44-
fi
26+
brew install libpq openssl ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja mongo-c-driver
27+
#if [ -f /usr/local/lib/libssl.dylib ]; then
28+
# sudo mv /usr/local/lib/libssl.dylib /usr/local/lib/libssl_bak.dylib
29+
#fi
30+
#if [ -f /usr/local/lib/libcrypto.dylib ]; then
31+
# sudo mv /usr/local/lib/libcrypto.dylib /usr/local/lib/libcrypto_bak.dylib
32+
#fi
33+
#if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib ]; then
34+
# sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib /usr/local/lib/libssl.dylib
35+
#fi
36+
#if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib ]; then
37+
# sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib /usr/local/lib/libcrypto.dylib
38+
#fi
39+
#if [ -d /usr/local/include/openssl ]; then
40+
# sudo mv /usr/local/include/openssl /usr/local/include/openssl_bak
41+
#fi
42+
#if [ -d /usr/local/Cellar/openssl@1.1/1.1.1g/include ]; then
43+
# sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/include /usr/local/include/openssl
44+
#fi
4545
pushd /tmp
4646
wget -q https://github.com/efficient/libcuckoo/archive/master.zip
4747
unzip master.zip
@@ -50,12 +50,6 @@ jobs:
5050
cmake -DCMAKE_INSTALL_PREFIX=/usr/local . && sudo make install
5151
cd /tmp
5252
rm -rf libcuckoo-master
53-
#wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
54-
#tar xf mongo-c-driver-1.4.2.tar.gz
55-
#rm -f mongo-c-driver-1.4.2.tar.gz
56-
#cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
57-
#cd /tmp
58-
#rm -rf mongo-c-driver-1.4.2
5953
wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
6054
tar xf v1.0.0.tar.gz
6155
rm -f v1.0.0.tar.gz

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM archlinux:latest
55
# bsdtar -C / -xvf "$patched_glibc"
66
#RUN echo "IgnorePkg = glibc" >> /etc/pacman.conf
77

8-
RUN pacman -Sy --noconfirm gcc gcc-libs glibc autoconf-archive autoconf automake libtool make clang unixodbc curl postgresql-libs libmemcached cmake openssh wget gnu-netcat tar gzip zlib unzip gawk grep sed core/binutils diffutils procps-ng openldap
8+
RUN pacman -Sy --noconfirm gcc gcc-libs autoconf-archive clang unixodbc postgresql-libs libmemcached cmake openssh wget gnu-netcat unzip
99

1010
#Install libcuckoo headers
1111
WORKDIR /tmp

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM archlinux:latest
55
# bsdtar -C / -xvf "$patched_glibc"
66
#RUN echo "IgnorePkg = glibc" >> /etc/pacman.conf
77

8-
RUN pacman -Sy --noconfirm gcc gcc-libs glibc autoconf-archive autoconf automake libtool make clang unixodbc curl postgresql-libs libmemcached cmake openssh wget gnu-netcat tar gzip zlib unzip gawk grep sed core/binutils diffutils procps-ng openldap
8+
RUN pacman -Sy --noconfirm gcc gcc-libs autoconf-archive clang unixodbc postgresql-libs libmemcached cmake openssh wget gnu-netcat unzip
99

1010
#Install libcuckoo headers
1111
WORKDIR /tmp

0 commit comments

Comments
 (0)