sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Deps/ACE): remove ACE library (part 1/2) (#6980)

Browse Source
This commit is contained in:
Kargatum
2021-07-16 20:05:39 +07:00
committed by GitHub
parent c17ce009dd
commit 96c51317f5
10 changed files with 16 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/docker/Dockerfile
+3 -3
View File
@@ -27,7 +27,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# Do not use acore dashboard to install
# since it's not cacheable by docker
RUN apt-get update && apt-get install -y gdb gdbserver git dos2unix lsb-core sudo curl unzip \
make cmake clang libmysqlclient-dev libace-dev \
make cmake clang libmysqlclient-dev \
libboost-system1.7*-dev libboost-filesystem1.7*-dev libboost-program-options1.7*-dev libboost-iostreams1.7*-dev \
build-essential libtool cmake-data openssl libgoogle-perftools-dev google-perftools \
libssl-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev mysql-client \
@@ -109,7 +109,7 @@ RUN addgroup --gid $GROUP_ID acore && \
# install the required dependencies to run the server
RUN apt-get update && apt-get install -y dos2unix gdb gdbserver google-perftools libgoogle-perftools-dev net-tools \
libboost-system1.7*-dev libboost-filesystem1.7*-dev libboost-program-options1.7*-dev libboost-iostreams1.7*-dev \
tzdata libmysqlclient-dev libace-dev mysql-client curl unzip && rm -rf /var/lib/apt/lists/* ;
tzdata libmysqlclient-dev mysql-client curl unzip && rm -rf /var/lib/apt/lists/* ;
# change timezone in container
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && dpkg-reconfigure --frontend noninteractive tzdata
@@ -281,7 +281,7 @@ ENV TZ=Etc/UTC
# set noninteractive mode so tzdata doesn't ask to set timezone on install
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y libmysqlclient-dev libace-dev libssl-dev libbz2-dev \
RUN apt-get update && apt-get install -y libmysqlclient-dev libssl-dev libbz2-dev \
libboost-system1.7*-dev libboost-filesystem1.7*-dev libboost-program-options1.7*-dev libboost-iostreams1.7*-dev \
sudo && rm -rf /var/lib/apt/lists/* ;
apps/installer/includes/os_configs/debian.sh
+1 -1
View File
@@ -6,7 +6,7 @@ DEBIAN_VERSION=$(lsb_release -sr)
sudo apt-get update -y
sudo apt-get install -y gdbserver gdb unzip curl libace-6.* libace-dev \
sudo apt-get install -y gdbserver gdb unzip curl \
libncurses-dev libreadline-dev clang g++ \
gcc git cmake make ccache
apps/installer/includes/os_configs/osx.sh
+1 -1
View File
@@ -13,4 +13,4 @@ if ! command -v cmake &>/dev/null ; then
fi
##########################################
brew install openssl readline ace boost bash-completion curl unzip mysql ccache
brew install openssl readline boost bash-completion curl unzip mysql ccache
apps/installer/includes/os_configs/ubuntu.sh
+5 -5
View File
@@ -7,7 +7,7 @@ UBUNTU_VERSION=$(lsb_release -sr);
sudo apt update
# shared deps
sudo apt-get -y install ccache clang cmake curl google-perftools libace-dev libmysqlclient-dev make unzip
sudo apt-get -y install ccache clang cmake curl google-perftools libmysqlclient-dev make unzip
if [[ $CONTINUOUS_INTEGRATION || $DOCKER ]]; then
sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get -y install build-essential cmake-data \
@@ -17,13 +17,13 @@ else
case $UBUNTU_VERSION in
"20.04")
sudo apt-get install -y g++ gdb gdbserver gcc git \
libace-6.* libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
libssl-dev mysql-server
libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
libssl-dev mysql-server
;;
*)
sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get install -y g++ gdb gdbserver gcc git \
libace-6.* libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
libssl-dev mysql-server
libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
libssl-dev mysql-server
;;
esac
fi