Change in docker-playground[master]: ogt: Update base image to debian buster

pespin gerrit-no-reply at lists.osmocom.org
Mon Mar 22 11:38:35 UTC 2021


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23448 )


Change subject: ogt: Update base image to debian buster
......................................................................

ogt: Update base image to debian buster

The OGT build setup and the physicial setup use now debian buster. Let's
update this container too to buster to avoid different versions of libs
during build and runtime (such as libasan).

Change-Id: If5adfb3c52ec5ded2adaca984e7a8c05f5866d34
---
M osmo-gsm-tester/Dockerfile
1 file changed, 1 insertion(+), 20 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/48/23448/1

diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile
index 764d6dc..8dea613 100644
--- a/osmo-gsm-tester/Dockerfile
+++ b/osmo-gsm-tester/Dockerfile
@@ -1,7 +1,5 @@
 ARG	USER
-FROM	$USER/debian-stretch-jenkins
-# Arguments used after FROM must be specified again
-ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+FROM	$USER/debian-buster-jenkins
 
 MAINTAINER Pau Espin Pedrol <pespin at sysmocom.de>
 
@@ -77,15 +75,6 @@
         make && \
         make install
 
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
-
-COPY	.common/Release.key /tmp/Release.key
-
-RUN	apt-key add /tmp/Release.key && \
-	rm /tmp/Release.key && \
-	echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list
-
-ADD	$OSMOCOM_REPO/Release /tmp/Release
 RUN	apt-get update && \
 	apt-get install -y --no-install-recommends \
 		telnet \
@@ -135,14 +124,6 @@
 	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GSM_TESTER_BRANCH || exit 1); \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD
 
-# Install osmo-ci.git/scripts to /usr/local/bin
-ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit
-RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \
-	cp -v $(find osmo-ci/scripts \
-		-maxdepth 1 \
-		-type f ) \
-	   /usr/local/bin
-
 # Copy several scripts and permission for osmo-gsm-tester:
 RUN     mkdir -p /usr/local/bin/ && cp osmo-gsm-tester/utils/bin/* /usr/local/bin/
 RUN     mkdir -p /etc/sudoers.d/ && cp osmo-gsm-tester/utils/sudoers.d/* /etc/sudoers.d/

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23448
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If5adfb3c52ec5ded2adaca984e7a8c05f5866d34
Gerrit-Change-Number: 23448
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210322/a93a621d/attachment.htm>


More information about the gerrit-log mailing list