Merge pull request #188 from H2-invent/feature/fix-release

Feature/fix release
H2-invent · Jun 9, 2023 · 3f338ae · 3f338ae
2 parents 686c834 + 523223b
commit 3f338ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,6 +18,7 @@ RUN rm -rf node_modules/
 #copy all the rest of the app
 COPY . /var/www/html
 #install all php dependencies
+RUN chown -R docker:docker secretStorage
 USER docker
 RUN composer install
 USER root

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -103,7 +103,7 @@ services:
       - "traefik.http.services.app-odc.loadbalancer.sticky.cookie.secure=true"
     volumes:
       - datenschutzcenter_uploads:/var/www/html/public/uploads:rw
-      - datenschutzcenter_secret_storage:/var/www/html/public/uploads:rw
+      - datenschutzcenter_secret_storage:/var/www/html/secretStorage:rw
       - datenschutzcenter_data:/var/www/html/public/data:rw
       - $PWD/dockerupdate.sh:/etc/container/startup.sh
 

diff --git a/templates/base/__sidenav.html.twig b/templates/base/__sidenav.html.twig
@@ -77,9 +77,9 @@
             <li class="{{ app.request.attributes.get('_route') == 'bericht' ? 'active' }}">
                 <a href="{{ path('bericht') }}">{% trans %}reports{% endtrans %}</a>
             </li>
-            <li class="{{ app.request.attributes.get('_route') == 'external' ? 'active' }}">
-                <a href="{{ path('external') }}">{% trans %}external{% endtrans %}</a>
-            </li>
+{#            <li class="{{ app.request.attributes.get('_route') == 'external' ? 'active' }}">#}
+{#                <a href="{{ path('external') }}">{% trans %}external{% endtrans %}</a>#}
+{#            </li>#}
         {% endif %}
         {% if app.user.akademieUser %}
             <li class="{{ app.request.attributes.get('_route') == 'akademie' ? 'active' }}">
@@ -111,9 +111,9 @@
                     <li>
                         <a href="{{ path('team_dsb') }}">{% trans %}externalDsb{% endtrans %}</a>
                     </li>
-                    <li>
-                        <a href="{{ path('upload_new') }}">{% trans %}import{% endtrans %}</a>
-                    </li>
+{#                    <li>#}
+{#                        <a href="{{ path('upload_new') }}">{% trans %}import{% endtrans %}</a>#}
+{#                    </li>#}
                 </ul>
             </li>
         {% endif %}