Kaynağa Gözat

refactoring some containers

Mahmoud Zalt 8 yıl önce
ebeveyn
işleme
d58ef06907
3 değiştirilmiş dosya ile 18 ekleme ve 12 silme
  1. 5 3
      beanstalkd-console/Dockerfile
  2. 5 2
      caddy/Dockerfile
  3. 8 7
      hhvm/Dockerfile

+ 5 - 3
beanstalkd-console/Dockerfile

@@ -7,9 +7,11 @@ RUN apt-get update && apt-get install -y curl
 RUN curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /tmp
 RUN mv /tmp/beanstalk_console-master /source
 
-RUN apt-get remove --purge -y curl && apt-get autoclean && apt-get clean
-RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt-get remove --purge -y curl &&
+    apt-get autoclean &&
+    apt-get clean &&
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 EXPOSE 2080
 
-CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'
+CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'

+ 5 - 2
caddy/Dockerfile

@@ -1,11 +1,12 @@
 FROM alpine:3.4
+
 MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
 
 LABEL caddy_version="0.9.0" architecture="amd64"
 
 RUN apk update \
- && apk upgrade \
- && apk add tar curl
+    && apk upgrade \
+    && apk add tar curl
 
 RUN curl --silent --show-error --fail --location \
       --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
@@ -16,7 +17,9 @@ RUN curl --silent --show-error --fail --location \
  && /usr/bin/caddy -version
 
 EXPOSE 80 443 2015
+
 WORKDIR /var/www/laravel/public
 
 ENTRYPOINT ["caddy"]
+
 CMD ["-conf", "/etc/Caddyfile"]

+ 8 - 7
hhvm/Dockerfile

@@ -1,12 +1,13 @@
 FROM ubuntu:14.04  
 
-RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 
-RUN apt-get update -y && apt-get install -y software-properties-common \
-   && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \
-   && apt-get update -y \
-   && apt-get install -y hhvm \
-   && apt-get clean \
-   && rm -rf /var/lib/apt/lists/*
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
+
+RUN apt-get install -y software-properties-common \
+    && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \
+    && apt-get update -y \
+    && apt-get install -y hhvm \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /var/www/laravel