Commit Graph

32 Commits

Author SHA1 Message Date
Nikita P. Shupeyko
918af45637 Revert "Try a different package.json path"
This reverts commit f29f8500b8.
2017-05-02 14:39:47 +03:00
Nikita P. Shupeyko
f29f8500b8 Try a different package.json path 2017-05-02 14:36:49 +03:00
Nikita P. Shupeyko
5abe1437fa Merge branch 'master' into gulpfile-js 2017-05-02 14:18:37 +03:00
Shupeyko Nikita
9037fb57f3 Fix #1150 (#1151)
Fix #1150
2017-04-29 16:59:05 +03:00
Shupeyko Nikita
f5ccce4ef8 Switch from runtime- to compile-time set production django docker service (#1144)
Extends #971
2017-04-24 23:12:30 +02:00
Nikita P. Shupeyko
4907de5468 Build upon the latest node:7.9-slim 2017-04-23 03:10:23 +03:00
Nikita P. Shupeyko
68b2f63596 Resetting to the last version working locally with docker-compose 1.11.x 2017-04-23 02:42:08 +03:00
Nikita P. Shupeyko
873131425d Try utilizing relative package.json path 2017-04-23 02:35:34 +03:00
Nikita P. Shupeyko
f61e803fd4 Try switcging workdir to /app 2017-04-23 02:31:54 +03:00
Nikita P. Shupeyko
ff3e019a2d Revert "Try switching to node:6"
This reverts commit 62cc02df1a.
2017-04-23 02:26:31 +03:00
Nikita P. Shupeyko
62cc02df1a Try switching to node:6
To account for possible node:7 docker-compose incompatibiltiy
2017-04-23 02:11:45 +03:00
Nikita P. Shupeyko
bfed284ddc Switch to node:7-slim 2017-04-23 01:58:52 +03:00
Nikita P. Shupeyko
b6c026a523 Try fiixing node Dockerfile package.json COPY ones again 2017-04-23 01:48:39 +03:00
Nikita P. Shupeyko
1d21d80c72 Merge branch 'master' into gulpfile-js 2017-04-23 01:45:25 +03:00
Nikita P. Shupeyko
90b355cff4 FIx node Dockerfile package.json COPY 2017-04-23 01:45:20 +03:00
Daniel Roy Greenfeld
6aced9ba73 Remove Python 2.7 support per #1129 (#1130)
* Remove Python 2.7 support per

* Remove Python 2.7 references

* Remove Python 2.7 references

* remove python 2 entirely
2017-04-21 12:31:45 -07:00
Nikita P. Shupeyko
cd0416cf6b Introduce node service 2017-04-21 14:06:23 +03:00
Paul Brown
770abf960d nginx-secure.conf mixed tabs/spaces to only spaces (#902) 2016-11-24 08:21:47 -08:00
Delio Castillo
a4884bb5d7 Update nginx.conf (#808)
* Update nginx.conf

* Update .editorconfig

* Update .editorconfig

* Update nginx.conf

* Update .editorconfig

* Update .editorconfig
2016-09-20 23:22:47 +02:00
Jannis Gebauer
043ff3d8dc Merge pull request #636 from mirskiy/master
Changed nginx confs for dockers new networking
2016-08-31 11:39:16 +02:00
Andreas Meistad
41059ff4df Change use_python2 [N] to use_python3 [Y]
Fixes #747
2016-08-21 22:11:01 +02:00
Jannis Gebauer
34631ad819 adds the ability to wait for the postgres container (#736) 2016-08-16 12:20:41 -07:00
Burhan Khalid
716c179a03 postgresql versions are now selectable 2016-08-10 18:31:48 +03:00
Dan Mirsky
b766b7c4bc Fixes to support renewal with docker's new networking
Added new replacement variable for nginx-secure: ___NAMESERVER___. This
is parsed out from the system resolv.conf and used to resolve the
ip's of the containers dynamically
Modified nginx-secure.conf to resolve certbot dynamically
NOTE: if using `docker-compose run certbot ...`, set `--name certbot` so it
can be resolved properly
Added CMD /start.sh back in, guessing it was removed by accident
2016-07-25 13:14:18 -07:00
Delio Castillo
3e866e0aab makes the database backups compressed. restores compressed backups 2016-06-21 12:29:23 -07:00
Dan Mirsky
5827e7fdb2 Changed nginx confs for dockers new networking
Docker got rid of legacy links so there are no longer env vars pointing
to other containers. Instead, we can reference the containers directly.
This fixes problems with let's encrypt related to missing env vars.
See notice at the top of
https://docs.docker.com/compose/link-env-deprecated/
2016-06-19 00:46:14 -07:00
Daniel Roy Greenfeld
a6c803aaeb Combine RUN commands 2016-06-11 21:22:35 -07:00
Daniel Roy Greenfeld
a65a750464 Switch use_certbot to the MUCH more explicit use_letsencrypt 2016-06-05 13:17:19 -07:00
mjsisley
60bfc7afa1 remove typo /start.sh 2016-06-03 17:07:07 -07:00
mjsisley
4b05499d49 swap COPY to ADD in nginx Dockerfile 2016-06-03 08:39:45 -07:00
mjsisley
b8e02d2189 Add certbot(letsencrypt) support for docker 2016-06-03 08:07:39 -07:00
Audrey Roy Greenfeld
15f350f05e Change repo_name to project_slug for clarity. 2016-04-20 10:00:35 -07:00