Change in osmo-ci[master]: docker/rebuild_osmocom_jenkins_image.sh: remove jessie

osmith gerrit-no-reply at lists.osmocom.org
Tue Apr 2 10:15:40 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13485


Change subject: docker/rebuild_osmocom_jenkins_image.sh: remove jessie
......................................................................

docker/rebuild_osmocom_jenkins_image.sh: remove jessie

Don't build the debian jessie image anymore, and don't try to add
jessie-backports to the sources.list, since it does not exist anymore.

My understanding is, that we are moving away from the jessie images
anyway, and everything can be done with the strech images.

Related: OS#3894
Change-Id: Iba033e64876b7ed9d329c2a636a0ee5eb3af946e
---
M docker/Dockerfile_osmocom_jenkins.amd64
M docker/rebuild_osmocom_jenkins_image.sh
2 files changed, 3 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/85/13485/1

diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64
index c365380..7a279d4 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -1,8 +1,7 @@
-ARG DEBIAN_VERSION=jessie
+ARG DEBIAN_VERSION=stretch
 FROM debian:${DEBIAN_VERSION}
 
 RUN \
-    echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \
     dpkg --add-architecture i386 && \
     DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
@@ -29,7 +28,7 @@
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev  libusb-1.0-0-dev libtalloc-dev libgnutls28-dev
 
 # OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev
 
 # building
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf
diff --git a/docker/rebuild_osmocom_jenkins_image.sh b/docker/rebuild_osmocom_jenkins_image.sh
index 3dcca39..a2fae2e 100755
--- a/docker/rebuild_osmocom_jenkins_image.sh
+++ b/docker/rebuild_osmocom_jenkins_image.sh
@@ -19,6 +19,5 @@
 	build_once "-t" "${tag_name}" "--build-arg" DEBIAN_VERSION="${debian_version}"
 }
 
-# Create containers using jessie (Debian 8.0) and stretch (Debian 9.0) as base.
-build_container osmocom:amd64 jessie
+# Create containers using stretch (Debian 9.0) as base.
 build_container osmocom:deb9_amd64 stretch

-- 
To view, visit https://gerrit.osmocom.org/13485
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba033e64876b7ed9d329c2a636a0ee5eb3af946e
Gerrit-Change-Number: 13485
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190402/e76a7e8c/attachment.html>


More information about the gerrit-log mailing list