diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-11-28 02:49:01 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-11-29 17:47:44 +0100 |
| commit | c7d6cc86384f2120ecd86ed32f71304e977db292 (patch) | |
| tree | b90eb1dd6fc4ad8e01700b6a792494b7836e1ac6 /docker | |
| parent | 6a97f52b9a40d40bf6687f19f7f3c766270ff15c (diff) | |
jenkins docker: move smalltalk to separate Dockerfile
To reduce docker image rebuild time, move the Smalltalk related commands to a
separate file, which is currently not built by rebuild_osmocom_jenkins_image.sh
since there are no jenkins builds using that yet.
Change-Id: I1142f068100ef07ce7f177adaa8a0fe2fedb1b7b
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile_osmocom_jenkins.amd64 | 16 | ||||
| -rw-r--r-- | docker/Dockerfile_osmocom_jenkins_st.amd64 | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 5481a50..8d97bce 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -38,19 +38,3 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc 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 RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && python2 ./setup.py install && python3 ./setup.py install - - -RUN git clone http://git.savannah.gnu.org/r/smalltalk.git -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends flex libsigsegv-dev bison libgmp-dev texinfo zip libltdl-dev -RUN cd smalltalk && autoreconf --install --force && ./configure && make install -RUN rm -rf smalltalk -RUN git clone https://github.com/zecke/petitparser.git && cd petitparser && gst-package package.xml -RUN git clone https://github.com/zecke/petitparser-tests.git && cd petitparser-tests && gst-package package.xml -RUN git clone git://git.osmocom.org/smalltalk/osmo-st-logging && cd osmo-st-logging && gst-package package.xml -RUN git clone git://git.osmocom.org/smalltalk/osmo-st-core && cd osmo-st-core && gst-package package.xml -RUN git clone git://git.osmocom.org/smalltalk/osmo-st-network && cd osmo-st-network && gst-package package.xml -RUN git clone git://git.osmocom.org/smalltalk/osmo-st-gsm && cd osmo-st-gsm && gst-package --test package.xml -RUN git clone git://git.osmocom.org/smalltalk/osmo-st-openbsc-test && cd osmo-st-openbsc-test/fakebts && gst-package --test package.xml -RUN rm -rf petitparser petitparser-tests osmo-st-logging ost-st-core osmo-st-network osmo-st-gsm osmo-st-openbsc-test -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python-pip -RUN pip install timeout_decorator diff --git a/docker/Dockerfile_osmocom_jenkins_st.amd64 b/docker/Dockerfile_osmocom_jenkins_st.amd64 new file mode 100644 index 0000000..f5f8458 --- /dev/null +++ b/docker/Dockerfile_osmocom_jenkins_st.amd64 @@ -0,0 +1,16 @@ +FROM osmocom:amd64 + +RUN git clone http://git.savannah.gnu.org/r/smalltalk.git +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends flex libsigsegv- +RUN cd smalltalk && autoreconf --install --force && ./configure && make install +RUN rm -rf smalltalk +RUN git clone https://github.com/zecke/petitparser.git && cd petitparser && gst-package packag +RUN git clone https://github.com/zecke/petitparser-tests.git && cd petitparser-tests && gst-pa +RUN git clone git://git.osmocom.org/smalltalk/osmo-st-logging && cd osmo-st-logging && gst-pac +RUN git clone git://git.osmocom.org/smalltalk/osmo-st-core && cd osmo-st-core && gst-package p +RUN git clone git://git.osmocom.org/smalltalk/osmo-st-network && cd osmo-st-network && gst-pac +RUN git clone git://git.osmocom.org/smalltalk/osmo-st-gsm && cd osmo-st-gsm && gst-package --t +RUN git clone git://git.osmocom.org/smalltalk/osmo-st-openbsc-test && cd osmo-st-openbsc-test/ +RUN rm -rf petitparser petitparser-tests osmo-st-logging ost-st-core osmo-st-network osmo-st-g +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python-pip +RUN pip install timeout_decorator |