summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cgit/Dockerfile7
-rw-r--r--cgit/nginx.conf0
-rw-r--r--tt-rss/Dockerfile5
3 files changed, 10 insertions, 2 deletions
diff --git a/cgit/Dockerfile b/cgit/Dockerfile
index 27c3910..4bf5187 100644
--- a/cgit/Dockerfile
+++ b/cgit/Dockerfile
@@ -1,6 +1,9 @@
FROM gliderlabs/alpine:3.2
-# Add cgit and nginx config files
RUN apk --update add git
RUN apk --update add nginx
RUN apk --update add cgit
-ENTRYPOINT ["mysql"] \ No newline at end of file
+# TODO: make sure these paths are right
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY cgit.conf /etc/nginx/sites-enabled/cgit.conf
+COPY cgitrc /etc/cgitrc
+ENTRYPOINT ["nginx", "-g", "daemon off;"]
diff --git a/cgit/nginx.conf b/cgit/nginx.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cgit/nginx.conf
diff --git a/tt-rss/Dockerfile b/tt-rss/Dockerfile
index e69de29..7826293 100644
--- a/tt-rss/Dockerfile
+++ b/tt-rss/Dockerfile
@@ -0,0 +1,5 @@
+FROM gliderlabs/alpine:3.2
+RUN apk --update add nginx
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY tt-rss.conf /etc/nginx/sites-enabled/tt-rss.conf
+ENTRYPOINT ["nginx", "-g", "daemon off;"]