[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-380-g45e7a6dc8

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  45e7a6dc8080eb8cf1f0257c7446da3aa348659c (commit)
       via  4d8976a41a7c731b46c458250b726436db87293d (commit)
      from  4ec6ea24dd6e83236ea5cbe41ba8512e16f7bf52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 45e7a6dc8080eb8cf1f0257c7446da3aa348659c
Merge: 4ec6ea24d 4d8976a41
Author: Kevin JOLY <kev...@po...>
Date:   Wed Jun 14 15:14:44 2023 +0000

    Merge branch 'docker-image-from-debian-slim' into 'master'
    
    Use Debian bullseye-slim base image for docker
    
    See merge request armadeus/armadeus-bsp!5

commit 4d8976a41a7c731b46c458250b726436db87293d
Author: Kevin Joly <kev...@ar...>
Date:   Wed Jun 14 16:24:47 2023 +0200

    Use Debian bullseye-slim base image for docker

-----------------------------------------------------------------------

Summary of changes:
 docker/Dockerfile | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 67e46161a..1dcee1c0a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,20 +1,22 @@
-FROM debian:11
+FROM debian:bullseye-slim
 
-RUN apt update
-RUN apt install -y build-essential gcc g++ autoconf automake libtool bison flex gettext
-RUN apt install -y patch subversion texinfo wget git-core
-RUN apt install -y libncurses5 libncurses5-dev
-RUN apt install -y zlib1g-dev liblzo2-2 liblzo2-dev
-RUN apt install -y libacl1 libacl1-dev gawk cvs curl lzma
-RUN apt install -y uuid-dev mercurial unzip
-RUN apt install -y libftdi-dev
-RUN apt install -y bc quilt
-RUN apt install -y cpio rsync
+RUN apt update && \
+    apt install -y build-essential gcc g++ autoconf automake libtool bison flex gettext \
+                   patch subversion texinfo wget git-core \
+                   libncurses5 libncurses5-dev \
+                   zlib1g-dev liblzo2-2 liblzo2-dev \
+                   libacl1 libacl1-dev gawk cvs curl lzma \
+                   uuid-dev mercurial unzip \
+                   libftdi-dev \
+                   bc quilt \
+                   cpio rsync \
+		   locales && \
+    rm -rf /var/lib/apt/lists/*
 
 # Locales
-RUN apt install -y locales
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
+
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8


hooks/post-receive
-- 
armadeus