Skip to content

Commit

Permalink
Openssl wkhtmltopdf openssl.conf (#5)
Browse files Browse the repository at this point in the history
* change openssl.conf: SECLEVEL to 1

* install libxslt1-dev libxml2-dev wkhtmltopdf

* fix env for buster

* Use et_EE.UTF-8 locale
  • Loading branch information
teadur authored Feb 10, 2020
1 parent b0980ea commit 156ef44
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
11 changes: 10 additions & 1 deletion base_images/ruby_2_6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales
RUN sed -i -e 's/# et_EE.UTF-8 UTF-8/et_EE.UTF-8 UTF-8/' /etc/locale.gen && \
dpkg-reconfigure --frontend=noninteractive locales && \
update-locale LANG=et_EE.UTF-8

ENV LANG et_EE.UTF-8
RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc -s | apt-key add -
RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \
Expand Down Expand Up @@ -42,6 +48,9 @@ RUN apt-get install -y --no-install-recommends > /dev/null \
qtdeclarative5-dev=* \
fonts-liberation=* \
gstreamer1.0-x=* \
wkhtmltopdf \
libxslt1-dev \
libxml2-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -61,7 +70,7 @@ RUN dpkg -i /chrome.deb || apt-get update > /dev/null \
&& rm -rf /var/lib/apt/lists/*
RUN dpkg -i /chrome.deb
RUN rm /chrome.deb

RUN sed -i 's/SECLEVEL=2/SECLEVEL=1/' /etc/ssl/openssl.cnf

RUN mkdir -p /opt/webapps/app/tmp/pids
WORKDIR /opt/webapps/app
Expand Down
2 changes: 1 addition & 1 deletion base_images/ruby_2_6/push.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/env bash
#!/usr/bin/env bash
docker push internetee/ruby:2.6
docker push internetee/ruby:2.6-buster
docker push internetee/ruby:2.6.$(date +'%Y.%m.%d')

0 comments on commit 156ef44

Please sign in to comment.