diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-11-28 02:47:10 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-11-28 05:16:37 +0100 |
| commit | 48f0c0a2ecc7320b62309c5a52811d71387d8644 (patch) | |
| tree | 374d3d21757e9fff6b568273615380725d7b7aed | |
| parent | bc07ff92a12ebc9a5e559e0f13ad89c3a268b90a (diff) | |
jenkins docker: drop hardcoded osmo-deps.sh
The jenkins invocation of the docker image commonly includes the osmo-ci
scripts via binding ~/bin to an up-to-date checkout. We don't need another
version of osmo-deps.sh in /usr/local/bin.
Change-Id: I5ce9ab992afa3c5a7a0bb13b55cae016bc8e805f
| -rw-r--r-- | docker/Dockerfile_osmocom_jenkins.amd64 | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 5ecf6de..5481a50 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -40,19 +40,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && python2 ./setup.py install && python3 ./setup.py install -RUN echo "#!/bin/sh \n\ - \n\ -if ! test -d \$1; \n\ -then \n\ - git clone git://git.osmocom.org/\$1 \$1 \n\ -fi \n\ -\n\ -cd \$1 \n\ -git fetch origin \n\ -git reset --hard origin/master" > /usr/local/bin/osmo-deps.sh -RUN chmod +x /usr/local/bin/osmo-deps.sh - - 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 |