osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

osmo-gsm-tester: open5gs deps only for x86_64 

mongo-db is only available for x86_64 from their third party
repository. Don't attempt to install it for another architecture. As
this is part of the open5gs dependencies, don't install any of them
either.

This should fix the currently failing "update-osmo-ci-on-slaves"
jenkins job. I've considered disabling the build of the osmo-gsm-tester
container for ARM altogether, but the osmo-gsm-tester manual explicitly
mentions ARM trails.

Change-Id: Ieed36b1adf4b9ae147c7ee7ade22d4855c3dbac8
This commit is contained in:
Oliver Smith 2021-04-14 09:06:26 +02:00
parent 66a36a078d
commit 948e450794
1 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
osmo-gsm-tester/Dockerfile
View File

@ -114,41 +114,48 @@ RUN apt-get update && \
# install open5gs dependencies: (mongodb not available in Debian) # install open5gs dependencies: (mongodb not available in Debian)
# systemctl stuff: workaround for https://jira.mongodb.org/browse/SERVER-54386 # systemctl stuff: workaround for https://jira.mongodb.org/browse/SERVER-54386
ADD https://www.mongodb.org/static/pgp/server-4.4.asc /tmp/mongodb-server-4.4.asc ADD https://www.mongodb.org/static/pgp/server-4.4.asc /tmp/mongodb-server-4.4.asc
RUN apt-key add /tmp/mongodb-server-4.4.asc && \ RUN if [ "$(arch)" = "x86_64" ]; then \
echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongodb-org-4.4.list apt-key add /tmp/mongodb-server-4.4.asc && \
RUN apt-get update && \ echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" \
systemctl_path=$(which systemctl) && \ > /etc/apt/sources.list.d/mongodb-org-4.4.list; \
mv $systemctl_path /tmp/systemctl && \ fi
apt-get install -y --no-install-recommends mongodb-org && \ RUN if [ "$(arch)" = "x86_64" ]; then \
apt-get clean && \ apt-get update && \
mv /tmp/systemctl $systemctl_path && \ systemctl_path=$(which systemctl) && \
sed -i "s/127.0.0.1/$OGT_MASTER_ADDR/g" /etc/mongod.conf mv $systemctl_path /tmp/systemctl && \
apt-get install -y --no-install-recommends mongodb-org && \
apt-get clean && \
mv /tmp/systemctl $systemctl_path && \
sed -i "s/127.0.0.1/$OGT_MASTER_ADDR/g" /etc/mongod.conf; \
fi
# install open5gs dependencies: # install open5gs dependencies:
RUN apt-get update && \ RUN if [ "$(arch)" = "x86_64" ]; then \
apt-get install -y --no-install-recommends \ apt-get update && \
python3-pip \ apt-get install -y --no-install-recommends \
python3-setuptools \ python3-pip \
python3-wheel \ python3-setuptools \
ninja-build \ python3-wheel \
build-essential \ ninja-build \
flex \ build-essential \
bison \ flex \
git \ bison \
libsctp-dev \ git \
libgnutls28-dev \ libsctp-dev \
libgcrypt-dev \ libgnutls28-dev \
libssl-dev \ libgcrypt-dev \
libidn11-dev \ libssl-dev \
libmongoc-dev \ libidn11-dev \
libbson-dev \ libmongoc-dev \
libyaml-dev \ libbson-dev \
libnghttp2-dev \ libyaml-dev \
libmicrohttpd-dev \ libnghttp2-dev \
libcurl4-gnutls-dev \ libmicrohttpd-dev \
libnghttp2-dev \ libcurl4-gnutls-dev \
meson && \ libnghttp2-dev \
apt-get clean meson && \
apt-get clean; \
fi
WORKDIR /tmp WORKDIR /tmp