diff --git a/README.md b/README.md index 076bdb1..f7a4faf 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,7 @@ dockerfiles - [x] centurylink/watchtower - [x] drone/drone +- [x] drupal - [x] ghost - [x] gitlab/gitlab-ce - [ ] gliderlabs/logspout diff --git a/drupal/README.md b/drupal/README.md new file mode 100644 index 0000000..07854d5 --- /dev/null +++ b/drupal/README.md @@ -0,0 +1,33 @@ +drupal +====== + +``` +drupal: + image: drupal + ports: + - "8888:80" + links: + - mysql + restart: always + +mysql: + image: mysql + ports: + - "127.0.0.1:3306:3306" + environment: + - MYSQL_ROOT_PASSWORD=root + - MYSQL_DATABASE=drupal + restart: always +``` + +``` +cd ~/fig/drupal/ +docker-compose up -d mysql +sleep 30 +docker-compose up -d drupal + +docker cp drupal_mysql_1:/usr/bin/mysql /usr/local/bin/ +mysql -h127.0.0.1 -P3306 -uroot -proot drupal + +firefox http://127.0.0.1:8888 +``` diff --git a/drupal/docker-compose.yml b/drupal/docker-compose.yml new file mode 100644 index 0000000..4b3dc60 --- /dev/null +++ b/drupal/docker-compose.yml @@ -0,0 +1,7 @@ +drupal: + image: drupal + ports: + - "8888:80" + volumes: + - /var/www/html/sites + restart: always diff --git a/h2o/Dockerfile b/h2o/Dockerfile index 0e60a5a..1f7f787 100644 --- a/h2o/Dockerfile +++ b/h2o/Dockerfile @@ -9,11 +9,12 @@ ENV H2O_VER 1.7.0 ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz ENV H2O_DIR h2o-${H2O_VER} -RUN apk add -U build-base \ - cmake \ - curl \ - linux-headers \ - zlib-dev \ +RUN set -xe \ + && apk add -U build-base \ + cmake \ + curl \ + linux-headers \ + zlib-dev \ && curl -sSL ${H2O_URL} | tar xz \ && cd ${H2O_DIR} \ && cmake -DWITH_BUNDLED_SSL=on . \ @@ -28,9 +29,7 @@ RUN apk add -U build-base \ && rm -rf /var/cache/apk/* COPY h2o.conf /etc/ - WORKDIR /var/www/html -EXPOSE 80 443 - +EXPOSE 80 CMD ["h2o", "-c", "/etc/h2o.conf"] diff --git a/h2o/arm/Dockerfile b/h2o/arm/Dockerfile index f64e653..eaa4e16 100644 --- a/h2o/arm/Dockerfile +++ b/h2o/arm/Dockerfile @@ -9,11 +9,12 @@ ENV H2O_VER 1.7.0 ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz ENV H2O_DIR h2o-${H2O_VER} -RUN apk add -U build-base \ - cmake \ - curl \ - linux-headers \ - zlib-dev \ +RUN set -xe \ + && apk add -U build-base \ + cmake \ + curl \ + linux-headers \ + zlib-dev \ && curl -sSL ${H2O_URL} | tar xz \ && cd ${H2O_DIR} \ && cmake -DWITH_BUNDLED_SSL=on . \ @@ -28,9 +29,7 @@ RUN apk add -U build-base \ && rm -rf /var/cache/apk/* COPY h2o.conf /etc/ - WORKDIR /var/www/html -EXPOSE 80 443 - +EXPOSE 80 CMD ["h2o", "-c", "/etc/h2o.conf"] diff --git a/rtmp/README.md b/rtmp/README.md index f69cc23..c5c5e17 100644 --- a/rtmp/README.md +++ b/rtmp/README.md @@ -38,6 +38,7 @@ server: client: image: vimagick/rtmp-client-arm +# command: ffmpeg -i /dev/video0 -vf "hflip,vflip" -f flv rtmp://cctv.datageek.info/live/webcam devices: - /dev/video0:/dev/video0 environment: @@ -45,6 +46,8 @@ client: restart: always ``` +> You can run customized `ffmpeg` command. + ## Server ```