From c53c3e6b045834fb4c10a93d1994ada15d1a2c50 Mon Sep 17 00:00:00 2001
From: Igor WITZ <igor.witz@etu.utc.fr>
Date: Wed, 10 Oct 2018 21:20:18 +0200
Subject: [PATCH] correction de la mauvais pratique 2 : ordre alphabetique
---
debian/Dockerfile-jessie | 9 +++++----
debian/Dockerfile-stretch | 11 ++++++-----
pica-etherpad/Dockerfile | 19 ++++++++++---------
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/debian/Dockerfile-jessie b/debian/Dockerfile-jessie
index 11409668..1c3ecf55 100644
--- a/debian/Dockerfile-jessie
+++ b/debian/Dockerfile-jessie
@@ -4,12 +4,13 @@ MAINTAINER antoinebarbare@gmail.com
RUN apt-get update -y
RUN apt-get install -y vim \
- locate \
- git \
curl \
- wget \
+ git \
+ gpg \
+ locate \
nano \
- gnupg
+ vim \
+ wget
ENV TERM xterm
CMD ["/bin/bash"]
diff --git a/debian/Dockerfile-stretch b/debian/Dockerfile-stretch
index 57771902..fa76c12c 100644
--- a/debian/Dockerfile-stretch
+++ b/debian/Dockerfile-stretch
@@ -3,13 +3,14 @@ FROM debian:stretch
MAINTAINER antoinebarbare@gmail.com
RUN apt-get update -y
-RUN apt-get install -y vim \
- locate \
- git \
+RUN apt-get install -y
curl \
- wget \
+ git \
+ gpg \
+ locate \
nano \
- gpg
+ vim \
+ wget
ENV TERM xterm
CMD ["/bin/bash"]
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index e30ad05e..0edb1c17 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -13,16 +13,16 @@ RUN useradd -d /opt/etherpad-lite -u 1000 etherpad && \
curl -sL https://deb.nodesource.com/setup_9.x | bash - && \
apt-get update && \
apt-get install -y \
- nodejs \
- unzip \
- mysql-client \
- gzip \
- git \
+ build-essentials \
curl \
- python \
+ git \
+ gzip \
libssl-dev \
+ mysql-client \
+ nodejs \
pkg-config \
- build-essential && \
+ python \
+ unzip && \
rm -r /var/lib/apt/lists/* && \
curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip > etherpad.zip && \
unzip etherpad && \
@@ -46,12 +46,13 @@ RUN bin/installDeps.sh && \
ep_font_color \
ep_headings2 \
ep_markdown \
+ ep_pads_stats \
ep_page_view \
ep_spellcheck \
ep_subscript_and_superscript \
ep_table_of_contents \
- ep_user_font_size \
- ep_pads_stats
+ ep_user_font_size
+
RUN cd ~/src/templates && \
git clone https://framagit.org/DeBugs/picasoft-etherpad-landing-page.git && \
--
GitLab