Browse Source

Merges Dockerfile commands (#7)

Michael Weimann 4 weeks ago
parent
commit
87d714687b
1 changed files with 6 additions and 20 deletions
  1. 6
    20
      Dockerfile

+ 6
- 20
Dockerfile View File

@@ -8,12 +8,11 @@ RUN sed "s/stretch/testing/g" /etc/apt/sources.list.d/stable.list > /etc/apt/sou
8 8
 COPY preferences.d/* /etc/apt/preferences.d/
9 9
 
10 10
 # update and install packages
11
-RUN [ "apt-get", "-q", "update" ]
12
-RUN [ "apt-get", "-qy", "--allow-downgrades", "--allow-remove-essential", "--allow-change-held-packages", "upgrade" ]
13
-RUN apt-get install -y planet-venus/testing
14
-RUN apt-get install -y procps cron
15
-RUN [ "apt-get", "clean" ]
16
-RUN [ "rm", "-rf", "/var/lib/apt/lists/*", "/tmp/*", "/var/tmp/*" ]
11
+RUN apt-get -q update && \
12
+    apt-get -qy --allow-downgrades --allow-remove-essential --allow-change-held-packages upgrade && \
13
+    apt-get install -y planet-venus/testing procps cron && \
14
+    apt clean && \
15
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
17 16
 
18 17
 # Add venus user
19 18
 RUN adduser --quiet --disabled-password --shell /bin/bash --home /home/venus --gecos "User" venus
@@ -51,20 +50,7 @@ RUN ln -s en/atom.xml en/foafroll.xml en/index.html en/opml.xml en/rss20.xml .
51 50
 ADD https://status.fsfe.org/fsfe.org/ /dev/null
52 51
 
53 52
 # Initially run all planets
54
-RUN planet /home/venus/lang/da/planet_da.ini
55
-RUN planet /home/venus/lang/de/planet_de.ini
56
-RUN planet /home/venus/lang/en/planet_en.ini
57
-RUN planet /home/venus/lang/eo/planet_eo.ini
58
-RUN planet /home/venus/lang/es/planet_es.ini
59
-RUN planet /home/venus/lang/fi/planet_fi.ini
60
-RUN planet /home/venus/lang/fr/planet_fr.ini
61
-RUN planet /home/venus/lang/gmq/planet_gmq.ini
62
-RUN planet /home/venus/lang/it/planet_it.ini
63
-RUN planet /home/venus/lang/nl/planet_nl.ini
64
-RUN planet /home/venus/lang/no/planet_no.ini
65
-RUN planet /home/venus/lang/sk/planet_sk.ini
66
-RUN planet /home/venus/lang/sl/planet_sl.ini
67
-RUN planet /home/venus/lang/sv/planet_sv.ini
53
+RUN find /home/venus/lang/ -name "planet_*.ini" -exec planet {} \;
68 54
 
69 55
 # Switch back to root and run cron+Apache
70 56
 USER root

Loading…
Cancel
Save