From c3ae58c60ba57bd27a3a7264e4294acb92d44f14 Mon Sep 17 00:00:00 2001 From: Brennen Raimer <5969754+norweeg@users.noreply.github.com> Date: Sat, 1 Jun 2019 10:54:07 -0400 Subject: [PATCH 1/2] made build and entrypoint scripts executable --- docker/bootstrap.sh | 0 docker/build_docker.sh | 0 docker/scripts/_start_gunicorn.sh | 0 docker/scripts/gen_key.sh | 0 docker/scripts/start.sh | 0 docker/start_docker.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/bootstrap.sh mode change 100644 => 100755 docker/build_docker.sh mode change 100644 => 100755 docker/scripts/_start_gunicorn.sh mode change 100644 => 100755 docker/scripts/gen_key.sh mode change 100644 => 100755 docker/scripts/start.sh mode change 100644 => 100755 docker/start_docker.sh diff --git a/docker/bootstrap.sh b/docker/bootstrap.sh old mode 100644 new mode 100755 diff --git a/docker/build_docker.sh b/docker/build_docker.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/_start_gunicorn.sh b/docker/scripts/_start_gunicorn.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/gen_key.sh b/docker/scripts/gen_key.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh old mode 100644 new mode 100755 diff --git a/docker/start_docker.sh b/docker/start_docker.sh old mode 100644 new mode 100755 From 22b8cb6aee14bb8ff149ebb742d255dc51080856 Mon Sep 17 00:00:00 2001 From: Brennen Raimer <5969754+norweeg@users.noreply.github.com> Date: Sat, 1 Jun 2019 11:07:56 -0400 Subject: [PATCH 2/2] add clients for mysql, postgresql, and oracle --- Dockerfile.autobuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.autobuild b/Dockerfile.autobuild index 7619fb1..4388124 100644 --- a/Dockerfile.autobuild +++ b/Dockerfile.autobuild @@ -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