Browse Source

Merge pull request #147 from norweeg/fix_146

fixes #146
pull/150/head
Isaac Bythewood 5 years ago
committed by GitHub
parent
commit
6a86482512
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 2 deletions
  1. +2
    -2
      Dockerfile.autobuild
  2. +0
    -0
      docker/bootstrap.sh
  3. +0
    -0
      docker/build_docker.sh
  4. +0
    -0
      docker/scripts/_start_gunicorn.sh
  5. +0
    -0
      docker/scripts/gen_key.sh
  6. +0
    -0
      docker/scripts/start.sh
  7. +0
    -0
      docker/start_docker.sh

+ 2
- 2
Dockerfile.autobuild View File

@@ -32,7 +32,7 @@ RUN groupadd -g 2300 tmpgroup \
&& apt-get -y install nginx nginx-extras pwgen \
&& rm -rf /var/lib/apt/lists/*

RUN pip --no-cache-dir install pipenv gunicorn
RUN pip --no-cache-dir install pipenv gunicorn mysqlclient psycopg2 cx-Oracle

COPY Pipfile* /srv/www/pinry/

@@ -45,7 +45,7 @@ COPY . /srv/www/pinry/
RUN chown -R www-data:www-data /srv/www \
&& cd /srv/www/pinry \
&& python manage.py collectstatic --noinput

# Load in all of our config files.
ADD docker/nginx/nginx.conf /etc/nginx/nginx.conf


+ 0
- 0
docker/bootstrap.sh View File


+ 0
- 0
docker/build_docker.sh View File


+ 0
- 0
docker/scripts/_start_gunicorn.sh View File


+ 0
- 0
docker/scripts/gen_key.sh View File


+ 0
- 0
docker/scripts/start.sh View File


+ 0
- 0
docker/start_docker.sh View File


Loading…
Cancel
Save