Prechádzať zdrojové kódy

Ajout -p à la commande mkdir et commande pour les touchscreen

michel 6 rokov pred
rodič
commit
4c97210c10
2 zmenil súbory, kde vykonal 7 pridanie a 6 odobranie
  1. 6 5
      docker/adminassos/Dockerfile
  2. 1 1
      docker/php/Dockerfile

+ 6 - 5
docker/adminassos/Dockerfile

@@ -6,7 +6,8 @@ RUN sed 's/main$/main universe/' -i /etc/apt/sources.list
 RUN apt-get update && apt-get upgrade -y --no-install-recommends
 
 ### WKHTMLTOPDF
-RUN apt-get install -y build-essential xorg libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential xorg libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev
 
 RUN wget http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u11_amd64.deb
 RUN dpkg -i libssl1.0.0_1.0.1t-1+deb8u11_amd64.deb
@@ -54,16 +55,16 @@ RUN ln -s oalib/jpgraph
 RUN ln -s opentalent/lib/ajax/jq_ajax.php
 RUN ln -s opentalent/oa_auto_loader.php
 RUN ln -s opentalent/oa_PATH.php
-RUN mkdir fileadmin
+RUN mkdir -p fileadmin
 RUN cd fileadmin
 RUN ln -s /var/source/opentalent/templates
-RUN mkdir user_upload
+RUN mkdir -p user_upload
 RUN cd /var/www/opentalent
 RUN chown www-data:www-data -R opentalent
-RUN mkdir /var/log/opentalent
+RUN mkdir -p /var/log/opentalent
 RUN chown www-data:www-data -R /var/log/opentalent
 
 CMD cd /var/www/opentalent/opentalent && mkdir -p config && cd config \
     && for f in $(ls -d /var/source/config/config/*); do ln -fs $f; done && cd .. \
     && chown www-data:www-data -R config \
-    && apache2-foreground
+    && apache2-foreground

+ 1 - 1
docker/php/Dockerfile

@@ -6,7 +6,7 @@ RUN sed 's/main$/main universe/' -i /etc/apt/sources.list
 RUN apt-get update && apt-get upgrade -y --no-install-recommends
 
 ### WKHTMLTOPDF
-RUN apt-get install -y build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential xorg iputils-ping libssl-dev libxrender-dev wget gdebi ca-certificates wget xz-utils libxrender1 libxt6 libxtst6 fontconfig zlib1g-dev libpng-dev
 
 RUN wget http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u11_amd64.deb
 RUN dpkg -i libssl1.0.0_1.0.1t-1+deb8u11_amd64.deb