Change in docker-playground[master]: freeswitch: Attempt to ugprade Dockerfile to 1.10.2 + buster

[laforge]

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


Change subject: freeswitch: Attempt to ugprade Dockerfile to 1.10.2 + buster
......................................................................

freeswitch: Attempt to ugprade Dockerfile to 1.10.2 + buster

Change-Id: Ia18ff8a45bcb662352d29abdbf1b9a555f23d161
---
M freeswitch/Dockerfile
1 file changed, 15 insertions(+), 17 deletions(-)



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

diff --git a/freeswitch/Dockerfile b/freeswitch/Dockerfile
index ef37e93..50db389 100644
--- a/freeswitch/Dockerfile
+++ b/freeswitch/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM debian:jessie
+FROM debian:buster
 
 # Source Dockerfile:
 # https://github.com/docker-library/postgres/blob/master/9.4/Dockerfile
@@ -8,14 +8,10 @@
 RUN groupadd -r freeswitch --gid=999 && useradd -r -g freeswitch --uid=999 freeswitch
 
 # grab gosu for easy step-down from root
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
-    && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \
-    && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \
-    && gpg --verify /usr/local/bin/gosu.asc \
-    && rm /usr/local/bin/gosu.asc \
-    && chmod +x /usr/local/bin/gosu \
-    && apt-get purge -y --auto-remove ca-certificates wget
+RUN 	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		gosu \
+	&& rm -rf /var/lib/apt/lists/*
 
 # make the "en_US.UTF-8" locale so freeswitch will be utf-8 enabled by default
 RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
@@ -24,16 +20,18 @@
 
 # https://files.freeswitch.org/repo/deb/freeswitch-1.*/dists/jessie/main/binary-amd64/Packages
 
-ENV FS_MAJOR 1.6
+ENV FS_MAJOR 1.10
 
-RUN sed -i "s/jessie main/jessie main contrib non-free/" /etc/apt/sources.list
+RUN sed -i "s/buster main/buster main contrib non-free/" /etc/apt/sources.list
 
-# https://freeswitch.org/confluence/display/FREESWITCH/Debian+8+Jessie#Debian8Jessie-InstallingfromDebianpackages
-
-RUN apt-get update && apt-get install -y curl \
-    && curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - \
-    && echo "deb http://files.freeswitch.org/repo/deb/freeswitch-$FS_MAJOR/ jessie main" > /etc/apt/sources.list.d/freeswitch.list \
-    && apt-get purge -y --auto-remove curl
+# https://freeswitch.org/confluence/display/FREESWITCH/Debian+10+Buster
+RUN	apt-get update && \
+	apt-get install -y \
+		gnupg2 \
+		wget \
+    && wget -O - https://files.freeswitch.org/repo/deb/debian-release/fsstretch-archive-keyring.asc | apt-key add - \
+    && echo "deb http://files.freeswitch.org/repo/deb/debian-release/ buster main" > /etc/apt/sources.list.d/freeswitch.list \
+    && apt-get purge -y --auto-remove wget
 
 RUN apt-get update && apt-get install -y freeswitch-all \
     && apt-get clean && rm -rf /var/lib/apt/lists/*

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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia18ff8a45bcb662352d29abdbf1b9a555f23d161
Gerrit-Change-Number: 21737
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201216/88653c02/attachment.htm>