Merge pull request #85 from tamakiii/fix-docker-entrypoint

Fix docker entrypoint

.dockerignore

@@ -0,0 +1,2 @@
+**/.git
+**/tmp

Dockerfile

@@ -2,25 +2,27 @@ FROM ubuntu:18.04
 MAINTAINER TAKANO Mitsuhiro
 # @takano32 <takano32@gmail.com>
 
-# RUN apt-get update
+RUN apt-get update && \
+    apt-get install -y \
+      make \
+      wget \
+      jq \
+      nginx \
+      fcgiwrap \
+      squid \
+      && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
-RUN apt-get update && apt-get install -y \
- make \
- wget \
- jq \
- nginx \
- fcgiwrap \
- squid \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-ADD config/nginx_config /etc/nginx/sites-available/vscovid-crawler.conf
+COPY config/nginx_config /etc/nginx/sites-available/vscovid-crawler.conf
 RUN ln -s /etc/nginx/sites-available/vscovid-crawler.conf /etc/nginx/sites-enabled/vscovid-crawler.conf
 
-ADD config/squid.conf /etc/squid/squid.conf
+COPY config/squid.conf /etc/squid/squid.conf
+
+WORKDIR /app
+COPY . /app
 
-# RUN apt-get -y install curl
-# RUN apt-get -y install screen
+COPY docker-entrypoint.sh /usr/local/sbin/docker-entrypoint.sh
+ENTRYPOINT [ "docker-entrypoint.sh" ]
 
-EXPOSE 80
-CMD ["bash"]
+EXPOSE 80

README.md

@@ -60,12 +60,13 @@ $ make test
 
 ```
 docker build -t vscovid-crawler .
-docker run -it --rm -p 8080:80 -v $(pwd):/home/ubuntu/vscovid-crawler --entrypoint /home/ubuntu/vscovid-crawler/docker/entrypoint.sh vscovid-crawler
+docker run -it --rm -p 8080:80 -v $(pwd):/app vscovid-crawler
+docker run -it --rm -v $(pwd):/app vscovid-crawler bash
 ```
 
 ## Run with docker-compose
 
 ```
-$ docker-compose build
-$ docker-compose up
+docker-compose build
+docker-compose up
 ```

docker-compose.yml

@@ -1,9 +1,8 @@
-version: '2'
-services: 
+version: "2"
+services:
   vscovid-crawler:
     build: .
-    volumes: 
-      - .:/home/ubuntu/vscovid-crawler
+    volumes:
+      - .:/app
     ports:
-      - "8080:80"
-    entrypoint: /home/ubuntu/vscovid-crawler/docker/entrypoint.sh
+      - 8080:80

docker-entrypoint.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+if [ "$1" == "" ]; then
+  # import all
+  make -C /app test
+
+  $(which nginx) -t
+  /etc/init.d/nginx start
+
+  /etc/init.d/fcgiwrap start
+
+  mkdir -p /var/spool/squid
+  chown -R proxy:proxy /var/spool/squid
+  $(which squid) -N -f /etc/squid/squid.conf -z
+
+  exec $(which squid) -f /etc/squid/squid.conf -NYCd 1
+else
+  exec "$@"
+fi