zruseni adresare src, drobny bugfix

src/Dockerfile → Dockerfile

@@ -15,18 +15,18 @@ RUN virtualenv -p python3 venv
 #RUN bash -c 'source /venv/bin/activate; pip install -r pip-requirements.txt'
 RUN bash -c 'source /venv/bin/activate; pip install Django==2.0.3 psycopg2==2.7.4 django-statici18n==1.7.0 django-auth-oidc==0.4.5 pyjwkest==1.4.0 bleach==2.1.4 django-anymail==3.0 html2text==2018.1.9'
 
-ADD . /nalodeni/src/
+ADD . /nalodeni/
 
-#RUN bash -c 'touch /nalodeni/src/main/settings_local.py'   # this file needs to exist
+#RUN bash -c 'touch /nalodeni/main/settings_local.py'   # this file needs to exist
 #RUN adduser --disabled-login --quiet --gecos nalodeni nalodeni
 #RUN chown -R nalodeni:nalodeni /nalodeni/
-#RUN chmod u+x /nalodeni/src/docker-entrypoint.sh
+#RUN chmod u+x /nalodeni/docker-entrypoint.sh
 RUN bash -c 'adduser --disabled-login --quiet --gecos nalodeni nalodeni &&  \
              chmod -R o+r /nalodeni/ && \
-             chown -R nalodeni:nalodeni /nalodeni/src/static_files && \
-             chmod o+x /nalodeni/src/docker-entrypoint.sh && \
-             touch /nalodeni/src/main/settings_local.py '
+             chown -R nalodeni:nalodeni /nalodeni/static_files && \
+             chmod o+x /nalodeni/docker-entrypoint.sh && \
+             touch /nalodeni/main/settings_local.py '
 
 USER nalodeni
 
-ENTRYPOINT /nalodeni/src/docker-entrypoint.sh
+ENTRYPOINT /nalodeni/docker-entrypoint.sh

src/docker-compose.sample.yml → docker-compose.sample.yml

@@ -13,9 +13,9 @@ services:
   nalodeni:
     build: .
     container_name: nalodeni
-    command: bash -c "/nalodeni/src/docker-entrypoint.sh"
+    command: bash -c "/nalodeni/docker-entrypoint.sh"
     volumes:
-      - vol_static_nalodeni:/nalodeni/src/static_files
+      - vol_static_nalodeni:/nalodeni/static_files
     ports:
       - "8000"
     environment:

src/docker-entrypoint.sh → docker-entrypoint.sh

@@ -4,13 +4,13 @@ trap "echo TRAPed signal" HUP INT QUIT KILL TERM
 
 source /venv/bin/activate
 
-cd /nalodeni/src
+cd /nalodeni
 
 python manage.py migrate
 
 python manage.py collectstatic --noinput
 
-python manage.py loaddata nalodeni_interestregion nalodeni_topics nalodeni_skills
+python manage.py loaddata nalodeni_interestregion nalodeni_topics nalodeni_skills nalodeni_counties
 
 PYTHONIOENCODING=utf-8 python manage.py runserver 0.0.0.0:8000
 

install.sh

@@ -1,9 +1,9 @@
 virtualenv -p python3.5 venv
 
-source ./venv/bin/activate
+source venv/bin/activate
 
 pip install --upgrade pip
-pip install -r src/pip-requirements.txt
+pip install -r pip-requirements.txt
 
 ##
 #       Keycloak SSO
@@ -29,7 +29,6 @@ SQL
 ##
 #       App Setup
 ##
-./src/manage.py makemigrations nalodeni
-./src/manage.py migrate
-
+./manage.py makemigrations nalodeni
+./manage.py migrate