Commit 3e9f215f authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg

Fix docker build script

parent b357cabd
Pipeline #2344 failed with stages
in 25 seconds
......@@ -9,18 +9,22 @@ 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 gnupg build-essential python2.7 git zlib1g-dev ruby-full \
&& rm -rf /var/lib/apt/lists/*
RUN curl -sL https://deb.nodesource.com/setup_6.x -o nodesource_setup.sh
RUN chmod a+x ./nodesource_setup.sh
RUN ./nodesource_setup.sh
RUN apt-get install nodejs
RUN apt-get update && apt-get install -y curl npm python2.7 git
RUN cd /tmp && curl -LOk http://ftp.ruby-lang.org/pub/ruby/2.2/ruby-2.2.5.tar.gz && \
tar -xvzf ruby-2.2.5.tar.gz && \
cd ruby-2.2.5/ && \
./configure --prefix=/usr/local && \
make && \
make install && \
rm -rf ruby-2.2.5.tar.gz && \
rm -rf ruby-2.2.5
RUN ln -s `which nodejs` /usr/bin/node
RUN rm -rf /var/lib/apt/lists/*
# RUN cd /tmp && curl -LOk http://ftp.ruby-lang.org/pub/ruby/2.2/ruby-2.2.5.tar.gz && \
# tar -xvzf ruby-2.2.5.tar.gz && \
# cd ruby-2.2.5/ && \
# ./configure --prefix=/usr/local && \
# make && \
# make install && \
# rm -rf ruby-2.2.5.tar.gz && \
# rm -rf ruby-2.2.5
# RUN ln -s `which nodejs` /usr/bin/node
RUN gem install jekyll --no-ri --no-rdoc
RUN gem install rouge --no-ri --no-rdoc
......@@ -30,10 +34,10 @@ RUN node_modules/bower/bin/bower install --config.interactive=false -p --allow-r
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
RUN curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxLight.woff http://mal.uninett.no/uninett-theme/fonts/colfaxLight.woff \
&& curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxMedium.woff http://mal.uninett.no/uninett-theme/fonts/colfaxMedium.woff \
&& curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxRegular.woff http://mal.uninett.no/uninett-theme/fonts/colfaxRegular.woff \
&& curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxThin.woff http://mal.uninett.no/uninett-theme/fonts/colfaxThin.woff \
&& curl -o /srv/www/dist/bower_components/uninett-theme/fonts/colfaxRegularItalic.woff http://mal.uninett.no/uninett-theme/fonts/colfaxRegularItalic.woff
EXPOSE 80
......@@ -24,6 +24,11 @@ spec:
memory: 500Mi
requests:
memory: 300Mi
env:
- name: TLS
value: TRUE
- name: HOST
value: saml2int.org
ports:
- name: web
containerPort: $HTTP_PORT
......
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