Network7/postal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from denji/master

Browse Source 
ruby v2.6-rc, j2cli drop-in replacement by p2cli
This commit is contained in:
CatDeployed 2018-09-02 18:43:00 -04:00 committed by GitHub
commit e1288eceb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
alpine/Dockerfile
View File

@ -1,7 +1,9 @@
FROM ruby:2.5-alpine FROM ruby:2.6-rc-alpine
RUN apk --no-cache add nodejs mariadb-client git bash python2 libcap py-setuptools py-pip build-base mariadb-dev tzdata mariadb-client-libs \ RUN wget https://github.com/wrouesnel/p2cli/releases/download/r5/p2 -O /usr/local/bin/p2 \
&& pip install j2cli \ && chmod +x /usr/local/bin/p2
RUN apk --no-cache add nodejs mariadb-client git bash libcap build-base mariadb-dev tzdata mariadb-client-libs \
&& git clone https://github.com/atech/postal.git /opt/postal \ && git clone https://github.com/atech/postal.git /opt/postal \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& gem install bundler \ && gem install bundler \
@ -25,4 +27,5 @@ ADD src/templates /templates
EXPOSE 5000 EXPOSE 5000
## Startup ## Startup
# ENV RUBYOPT --jit
ENTRYPOINT ["/bin/bash", "-c", "/docker-entrypoint.sh ${*}", "--"] ENTRYPOINT ["/bin/bash", "-c", "/docker-entrypoint.sh ${*}", "--"]

2
alpine/src/docker-entrypoint.sh
View File

@ -3,7 +3,7 @@
## Generate config ## Generate config
if [ ! -f /opt/postal/config/postal.yml ] || [[ $(cat /opt/postal/config/postal.yml | wc -l) < 2 ]]; then if [ ! -f /opt/postal/config/postal.yml ] || [[ $(cat /opt/postal/config/postal.yml | wc -l) < 2 ]]; then
## Build Jinja2 Template ## Build Jinja2 Template
j2 /templates/postal.example.yml.j2 > /opt/postal/config/postal.example.yml p2 -t /templates/postal.example.yml.j2 -o /opt/postal/config/postal.example.yml
## Add in secret key building ## Add in secret key building
echo "rails:" >> /opt/postal/config/postal.example.yml echo "rails:" >> /opt/postal/config/postal.example.yml
echo " secret_key: {{secretkey}}" >> /opt/postal/config/postal.example.yml echo " secret_key: {{secretkey}}" >> /opt/postal/config/postal.example.yml

8
alpine/src/nginx.conf
View File

@ -1,17 +1,15 @@
server { server {
listen 80; listen 80;
root /opt/postal/public; root /opt/postal/public;
gzip_static on;
gzip_proxied any;
location / { location / {
client_max_body_size 50M; client_max_body_size 50M;
try_files $uri $uri/index.html $uri.html @puma; try_files $uri $uri/index.html $uri.html @puma;
} }
location /assets { location /assets {
add_header Cache-Control max-age=3600; add_header Cache-Control "public,max-age=3600,immutable";
} }
location @puma { location @puma {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;

12
ubuntu/Dockerfile
View File

@ -1,8 +1,13 @@
FROM ruby:2.4 FROM ruby:2.6-rc
RUN curl -L https://github.com/wrouesnel/p2cli/releases/download/r5/p2 -o /usr/local/bin/p2 \
&& chmod +x /usr/local/bin/p2
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
&& apt-get install -y nodejs
RUN apt-get -y update \ RUN apt-get -y update \
&& apt-get -y install --no-install-recommends nodejs mysql-client git-core python-minimal python-pip python-dev libcap2-bin python-setuptools \ && apt-get -y install --no-install-recommends nodejs mysql-client git-core libcap2-bin \
&& pip install j2cli \
&& git clone https://github.com/atech/postal.git /opt/postal \ && git clone https://github.com/atech/postal.git /opt/postal \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& gem install bundler \ && gem install bundler \
@ -26,4 +31,5 @@ ADD src/templates /templates
EXPOSE 5000 EXPOSE 5000
## Startup ## Startup
# ENV RUBYOPT --jit
ENTRYPOINT ["/bin/bash", "-c", "/docker-entrypoint.sh ${*}", "--"] ENTRYPOINT ["/bin/bash", "-c", "/docker-entrypoint.sh ${*}", "--"]

2
ubuntu/src/docker-entrypoint.sh
View File

@ -3,7 +3,7 @@
## Generate config ## Generate config
if [ ! -f /opt/postal/config/postal.yml ] || [[ $(cat /opt/postal/config/postal.yml | wc -l) < 2 ]]; then if [ ! -f /opt/postal/config/postal.yml ] || [[ $(cat /opt/postal/config/postal.yml | wc -l) < 2 ]]; then
## Build Jinja2 Template ## Build Jinja2 Template
j2 /templates/postal.example.yml.j2 > /opt/postal/config/postal.example.yml p2 -t /templates/postal.example.yml.j2 -o /opt/postal/config/postal.example.yml
## Add in secret key building ## Add in secret key building
echo "rails:" >> /opt/postal/config/postal.example.yml echo "rails:" >> /opt/postal/config/postal.example.yml
echo " secret_key: {{secretkey}}" >> /opt/postal/config/postal.example.yml echo " secret_key: {{secretkey}}" >> /opt/postal/config/postal.example.yml

8
ubuntu/src/nginx.conf
View File

@ -1,17 +1,15 @@
server { server {
listen 80; listen 80;
root /opt/postal/public; root /opt/postal/public;
gzip_static on;
gzip_proxied any;
location / { location / {
client_max_body_size 50M; client_max_body_size 50M;
try_files $uri $uri/index.html $uri.html @puma; try_files $uri $uri/index.html $uri.html @puma;
} }
location /assets { location /assets {
add_header Cache-Control max-age=3600; add_header Cache-Control "public,max-age=3600,immutable";
} }
location @puma { location @puma {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;