From 95410f6e43684b91efd616d6b118073d0e18e33e Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Tue, 14 Feb 2023 21:43:16 +0100 Subject: [PATCH 1/3] Only create virtualenv on toplevel --- .env | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.env b/.env index c4ddbce..f3e7645 100644 --- a/.env +++ b/.env @@ -1,6 +1,8 @@ if [ ! -d .virtualenv ]; then if [ ! "$(which virtualenv)" == "" ]; then - virtualenv -p python3 .virtualenv + if [ -f .env ]; then + virtualenv -p python3 .virtualenv + fi fi fi if [ -f .virtualenv/bin/activate ]; then From cbdaed28daca2f7f1e5d18a93fe7055ba03aed92 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 17 Apr 2023 13:44:51 +0200 Subject: [PATCH 2/3] Fix docker build + update fedora base image --- Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6927672..1fbc3dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,19 @@ -FROM quay.io/rhn_support_ofalk/fedora35-python3 +FROM quay.io/rhn_support_ofalk/fedora37-python3 LABEL maintainer Oliver Falk EXPOSE 8081 -RUN pip3 install pip --upgrade - ADD . /opt/ivatar-devel WORKDIR /opt/ivatar-devel -RUN pip3 install Pillow && pip3 install -r requirements.txt && pip3 install python-coveralls coverage pycco django_coverage_plugin +RUN pip3 install pip --upgrade \ + && virtualenv .virtualenv \ + && source .virtualenv/bin/activate \ + && pip3 install Pillow \ + && pip3 install -r requirements.txt && pip3 install python-coveralls coverage pycco django_coverage_plugin RUN echo "DEBUG = True" >> /opt/ivatar-devel/config_local.py RUN echo "EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'" >> /opt/ivatar-devel/config_local.py -RUN python3 manage.py migrate && python3 manage.py collectstatic --noinput -RUN echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@local.tld', 'admin')" | python manage.py shell -ENTRYPOINT python3 ./manage.py runserver 0:8081 +RUN source .virtualenv/bin/activate python3 manage.py migrate && python3 manage.py collectstatic --noinput \ + && echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@local.tld', 'admin')" | python manage.py shell +ENTRYPOINT source .virtualenv/bin/activate && python3 ./manage.py runserver 0:8081 From 021a8de4d8256a6c4d05691e3d6f6e5b6a0d4089 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 17 Apr 2023 15:07:20 +0200 Subject: [PATCH 3/3] Fix typo and break up lines a bit more --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fbc3dd..2f68d67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,13 @@ RUN pip3 install pip --upgrade \ && virtualenv .virtualenv \ && source .virtualenv/bin/activate \ && pip3 install Pillow \ - && pip3 install -r requirements.txt && pip3 install python-coveralls coverage pycco django_coverage_plugin + && pip3 install -r requirements.txt \ + && pip3 install python-coveralls coverage pycco django_coverage_plugin RUN echo "DEBUG = True" >> /opt/ivatar-devel/config_local.py RUN echo "EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'" >> /opt/ivatar-devel/config_local.py -RUN source .virtualenv/bin/activate python3 manage.py migrate && python3 manage.py collectstatic --noinput \ +RUN source .virtualenv/bin/activate \ + && python3 manage.py migrate \ + && python3 manage.py collectstatic --noinput \ && echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@local.tld', 'admin')" | python manage.py shell ENTRYPOINT source .virtualenv/bin/activate && python3 ./manage.py runserver 0:8081