Fixed bower.json, added Dockerfile and added default.conf for nginx

parent 4d008a1c
FROM nginx
COPY site /srv/www/site
COPY .bowerrc /srv/www/.bowerrc
COPY _config.yml /srv/www/_config.yml
COPY deploy_jenkins.sh /srv/www/deploy_jenkins.sh
COPY nova.config.json /srv/www/nova.config.json
COPY package.json /srv/www/package.json
COPY bower.json /srv/www/bower.json
WORKDIR /srv/www
ADD default.conf /etc/nginx/conf.d/default.conf
RUN apt-get update && apt-get install -y curl npm python2.7 ruby-full git
RUN ln -s `which nodejs` /usr/bin/node
RUN rm -rf /var/lib/apt/lists/*
RUN gem install jekyll --no-ri --no-rdoc
RUN gem install rouge --no-ri --no-rdoc
RUN npm install
RUN node_modules/bower/bin/bower install --config.interactive=false -p --allow-root
RUN jekyll build
RUN rm -rf /srv/www/dist/bower_components/uninett-theme/
RUN cd /srv/www/dist/bower_components/ && git clone https://github.com/andreassolberg/uninett-bootstrap-theme.git uninett-theme && cd uninett-theme && /srv/www/node_modules/bower/bin/bower install --allow-root
RUN curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxLight.woff http://mal.uninett.no/uninett-theme/fonts/colfaxLight.woff
RUN curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxMedium.woff http://mal.uninett.no/uninett-theme/fonts/colfaxMedium.woff
RUN curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxRegular.woff http://mal.uninett.no/uninett-theme/fonts/colfaxRegular.woff
RUN curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxThin.woff http://mal.uninett.no/uninett-theme/fonts/colfaxThin.woff
RUN curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxRegularItalic.woff http://mal.uninett.no/uninett-theme/fonts/colfaxRegularItalic.woff
EXPOSE 80
EXPOSE 443
\ No newline at end of file
......@@ -9,7 +9,7 @@
"author": "Andreas Åkre Solberg",
"dependencies": {
"requirejs": "*",
"uninett-theme": "git@scm.uninett.no:system/uninett-theme.git",
"uninett-theme": "https://github.com/andreassolberg/uninett-bootstrap-theme.git",
"font-awsome": "*"
},
"cwd": "site",
......
server {
listen 80;
server_name localhost;
#charset koi8-r;
#access_log /var/log/nginx/log/host.access.log main;
location / {
root /srv/www/dist;
index index.html index.htm;
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
# root html;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include fastcgi_params;
#}
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment