diff --git a/docker/haproxy/Dockerfile b/docker/haproxy/Dockerfile index 99f421c79..6130fb09a 100644 --- a/docker/haproxy/Dockerfile +++ b/docker/haproxy/Dockerfile @@ -6,4 +6,5 @@ WORKDIR /srv/newsblur RUN /bin/bash -c 'echo "ENABLED=1" | tee /etc/default/haproxy' RUN /bin/bash -c 'mkdir -p /srv/newsblur/config/certificates/' -COPY 'config/haproxy_rsyslog.conf' '/etc/rsyslog.d/49-haproxy.conf' \ No newline at end of file +COPY 'config/haproxy_rsyslog.conf' '/etc/rsyslog.d/49-haproxy.conf' +COPY './docker/haproxy/haproxy.conf /usr/local/etc/haproxy/haproxy.cfg' \ No newline at end of file diff --git a/docker/newsblur_base_image.Dockerfile b/docker/newsblur_base_image.Dockerfile index d7bd0ee27..92bdd3de5 100644 --- a/docker/newsblur_base_image.Dockerfile +++ b/docker/newsblur_base_image.Dockerfile @@ -29,4 +29,5 @@ RUN set -ex \ && apt-get install -y $rundDeps $buildDeps --no-install-recommends \ && pip install -r requirements.txt \ && apt-get purge -y --auto-remove ${buildDeps} \ - && rm -rf /var/lib/apt/lists/* \ No newline at end of file + && rm -rf /var/lib/apt/lists/* +COPY ./config /etc/supervisor/conf.d/ \ No newline at end of file diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile new file mode 100644 index 000000000..86eb66307 --- /dev/null +++ b/docker/nginx/Dockerfile @@ -0,0 +1,2 @@ +FROM nginx:latest +COPY ./docker/nginx /etc/nginx/conf.d \ No newline at end of file diff --git a/docker/node/node_prod.Dockerfile b/docker/node/node_prod.Dockerfile new file mode 100644 index 000000000..56738d6c6 --- /dev/null +++ b/docker/node/node_prod.Dockerfile @@ -0,0 +1,34 @@ +FROM node:14.4.0 +WORKDIR /usr/src/app +RUN set -ex \ + && rundDeps=' \ + libpq5 \ + libjpeg62 \ + libxslt1.1 \ + ' \ + && buildDeps=' \ + patch \ + python-dev \ + gfortran \ + lib32ncurses5-dev \ + libblas-dev \ + libffi-dev \ + libjpeg-dev \ + default-libmysqlclient-dev \ + libpq-dev \ + libreadline6-dev \ + liblapack-dev \ + libxml2-dev \ + libxslt1-dev \ + ncurses-dev \ + zlib1g-dev \ + ' \ + && apt-get update \ + && apt-get install -y $rundDeps $buildDeps --no-install-recommends \ + && apt-get purge -y --auto-remove ${buildDeps} \ + && rm -rf /var/lib/apt/lists/* + +COPY ./node/package.json /usr/src/app/package.json +COPY ./node/package-lock.json /usr/src/app/package-lock.json +COPY ./node /usr/src/app/ +RUN npm install \ No newline at end of file diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile new file mode 100644 index 000000000..fa4eaa080 --- /dev/null +++ b/docker/redis/Dockerfile @@ -0,0 +1,3 @@ +FROM redis:3 +COPY ./config/redis.conf /usr/local/etc/redis_server.conf +COPY ./config/redis_docker.conf /etc/redis_server.conf \ No newline at end of file