Skip to content

Commit

Permalink
mediengewitter: saved from code rot
Browse files Browse the repository at this point in the history
update dependecies, dockerfile, deployment config, nginx config
  • Loading branch information
makefu committed Jul 24, 2015
1 parent 6036ad4 commit 96cbbba
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion sites/mediengewitter.krebsco.de/mediengewitter/DEPLOY.md
Expand Up @@ -2,7 +2,7 @@

docker build -t krebs/mediengewitter .
# autostart this somehow
docker run -p 127.0.0.1::8080 -v /media/ext/magnet_pics/:/images krebs/mediengewitter
docker run -p 127.0.0.1:8080:8080 -v /media/ext/magnet_pics/:/images krebs/mediengewitter

# nginx

Expand Down
11 changes: 3 additions & 8 deletions sites/mediengewitter.krebsco.de/mediengewitter/Dockerfile
@@ -1,14 +1,9 @@
FROM ubuntu:latest
RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
RUN dpkg-divert --local --rename --add /sbin/initctl
RUN ln -s /bin/true /sbin/initctl
RUN apt-get update
RUN apt-get install -y python-software-properties python g++ make
RUN add-apt-repository -y ppa:chris-lea/node.js
RUN apt-get update
RUN apt-get -y install nodejs
RUN apt-get install -y python gcc make nodejs npm
RUN ln -s /usr/bin/nodejs /usr/bin/node
Add mediengewitter/ /mediengewitter
RUN cd /mediengewitter && npm install
RUN cd /mediengewitter && npm install
# -v /media/ext/magnet_pics/:/images
EXPOSE 8080
ENV PORT 8080
Expand Down
@@ -1,15 +1,21 @@
server {
listen 80;
server_name mediengewitter.krebsco.de;
listen 80;
server_name mediengewitter.krebsco.de;
# access_log /var/log/nginx/log/mediengewitter.log;
# error_log /var/log/nginx/log/mediengewitter_error.log;
default_type text/plain;
location / {
default_type text/plain;
location / {
proxy_pass http://127.0.0.1:8080/;
proxy_redirect off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
location /socket.io/ {
proxy_pass http://127.0.0.1:8080;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
}

0 comments on commit 96cbbba

Please sign in to comment.