Change in osmo-ci[master]: docker: add more dependencies
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15759 ) Change subject: docker: add more dependencies .. docker: add more dependencies Prepare for building almost all Osmocom repositories in docker, by installing new required dependencies: * libaio-dev: needed for osmo-ccid-firmware * libasound2-dev: needed for gapk * libboost-all-dev: needed for libusrp * libcsv-dev: needed for osmo-remsim * libmnl-dev: needed for libgtpnl * libnewlib-arm-none-eabi: needed to cross compile libosmocore to arm * liboping-dev: needed for osmo-sysmon * libulfius: needed for osmo-remsim (libulfius is not packaged in debian stretch, download the project's official .deb release instead) * libzmq3-dev: needed for osmo-pcap * sdcc: needed for libusrp * systemd: needed for osmo-remsim (provides systemd.pc, indirect dependency through libulfius) Related: OS#3726 Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: osmith: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 897db15..58e1ee9 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -1,6 +1,10 @@ ARG DEBIAN_VERSION=stretch FROM debian:${DEBIAN_VERSION} +# Make "$DEBIAN_VERSION" available after FROM +# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact +ARG DEBIAN_VERSION + RUN \ dpkg --add-architecture i386 && \ DEBIAN_FRONTEND=noninteractive apt-get update && \ @@ -43,7 +47,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc # and all -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev libsofia-sip-ua-glib-dev libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop libgmp-dev gawk texinfo flex bison bc libsigsegv-dev libffi-dev libusb-1.0-0-dev libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client stow +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev libsofia-sip-ua-glib-dev libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop libgmp-dev gawk texinfo flex bison bc libsigsegv-dev libffi-dev libusb-1.0-0-dev libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client stow libnewlib-arm-none-eabi libaio-dev libasound2-dev libzmq3-dev libmnl-dev libboost-all-dev sdcc liboping-dev libcsv-dev systemd # Add rpath to binaries RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf @@ -69,3 +73,14 @@ # Code coverage tools RUN DEBIAN_FRONTEND=noninteractive apt-get install -y lcov RUN pip3 install git+https://github.com/eriwen/lcov-to-cobertura-xml/ + +# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above) +ARG LIBULFIUS_VER="2.6.4" +ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}"; +ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb +ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz +RUN cd /tmp/ulfius && \ + tar -xvf all.tar.gz && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \ + cd ~ && \ + rm -r /tmp/ulfius -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 Gerrit-Change-Number: 15759 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: docker: add more dependencies
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15759 ) Change subject: docker: add more dependencies .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 Gerrit-Change-Number: 15759 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Oct 2019 10:47:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: docker: add more dependencies
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15759 ) Change subject: docker: add more dependencies .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 Gerrit-Change-Number: 15759 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 11 Oct 2019 10:40:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: docker: add more dependencies
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15759 ) Change subject: docker: add more dependencies .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 Gerrit-Change-Number: 15759 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 11 Oct 2019 08:24:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: docker: add more dependencies
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/15759 ) Change subject: docker: add more dependencies .. docker: add more dependencies Prepare for building almost all Osmocom repositories in docker, by installing new required dependencies: * libaio-dev: needed for osmo-ccid-firmware * libasound2-dev: needed for gapk * libboost-all-dev: needed for libusrp * libcsv-dev: needed for osmo-remsim * libmnl-dev: needed for libgtpnl * libnewlib-arm-none-eabi: needed to cross compile libosmocore to arm * liboping-dev: needed for osmo-sysmon * libulfius: needed for osmo-remsim (libulfius is not packaged in debian stretch, download the project's official .deb release instead) * libzmq3-dev: needed for osmo-pcap * sdcc: needed for libusrp * systemd: needed for osmo-remsim (provides systemd.pc, indirect dependency through libulfius) Related: OS#3726 Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/15759/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 Gerrit-Change-Number: 15759 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-MessageType: newpatchset
Change in ...osmo-ci[master]: docker: add more dependencies
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15759 Change subject: docker: add more dependencies .. docker: add more dependencies Prepare for building almost all Osmocom repositories in docker, by installing new required dependencies: * libaio-dev: needed for osmo-ccid-firmware * libasound2-dev: needed for gapk * libboost-all-dev: needed for libusrp * libcsv-dev: needed for osmo-remsim * libmnl-dev: needed for libgtpnl * libnewlib-arm-none-eabi: needed to cross compile libosmocore to arm * liboping-dev: needed for osmo-sysmon * libulfius: needed for osmo-remsim (libulfius is not packaged in debian stretch, download the project's official .deb release instead) * libzmq3-dev: needed for osmo-pcap * sdcc: needed for libusrp * systemd: needed for osmo-remsim (provides systemd.pc, indirect dependency through libulfius) Related: OS#3726 Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/15759/1 diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 897db15..62855c9 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -1,6 +1,10 @@ ARG DEBIAN_VERSION=stretch FROM debian:${DEBIAN_VERSION} +# Make "$DEBIAN_VERSION" available after FROM +# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact +ARG DEBIAN_VERSION + RUN \ dpkg --add-architecture i386 && \ DEBIAN_FRONTEND=noninteractive apt-get update && \ @@ -43,7 +47,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc # and all -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev libsofia-sip-ua-glib-dev libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop libgmp-dev gawk texinfo flex bison bc libsigsegv-dev libffi-dev libusb-1.0-0-dev libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client stow +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev libsofia-sip-ua-glib-dev libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop libgmp-dev gawk texinfo flex bison bc libsigsegv-dev libffi-dev libusb-1.0-0-dev libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client stow libnewlib-arm-none-eabi libaio-dev libasound2-dev libzmq3-dev libmnl-dev libboost-all-dev sdcc liboping-dev libcsv-dev systemd # Add rpath to binaries RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf @@ -69,3 +73,14 @@ # Code coverage tools RUN DEBIAN_FRONTEND=noninteractive apt-get install -y lcov RUN pip3 install git+https://github.com/eriwen/lcov-to-cobertura-xml/ + +# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above) +ARG LIBULFIUS_VER="2.6.4" +ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}"; +ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb +ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz +RUN cd /tmp/ulfius \ + && tar -xvf all.tar.gz \ + && DEBIAN_FRONTEND=noninteractive apt install -y /tmp/ulfius/*.deb \ + && cd ~ \ + && rm -r /tmp/ulfius -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5caebd26090169cc3c9fdd1f14984ea2a75347e8 Gerrit-Change-Number: 15759 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange