Reverted Dockerfile, need to re-examine changes between v5 and v6 for…

… ARM support

Dont supply example APP_KEY.
Fix layout glitch on filter modal
Fix hidden button on comment detail widget

Merge MunkiReport v6 (munkireport#1498) into v6 wip branch

Python 3 for MunkiReport v5 (munkireport#1498)

* Merge 5.6.5 (munkireport#1407)

* Update composer.json

* Updated CHANGELOG

* Bump version to 5.6.5

* Release version 5.6.5.

* Bumping to v5.6.6 for development.

* Update third party module repos (munkireport#1408)

* Decode subprocess output

* Use munki-python for munki postflight script

* Make munki postflight py3 compatible (munkireport#1456)

* Decode subprocess output

* Use munki-python for munki postflight script

* Remove unused shebangs

* Update hashbang to munkireport-python2

* First pass at py3 compatibility

* Bytes vs strings fixes

* Fix logic errors

* Rename await_sym

* Change hashbang to munkireport-python3

* Update CHANGELOG.md

* 5.x-Py3 (munkireport#49)

* Fix release script for 5.x

* Add tar to release

* Fix running system_profiler on Apple Silicon Macs (munkireport#1477)

Only needed for MR 5.x

* Fix docker compose image (munkireport#1466)

* fix docker image

* fix not needed detail

* Update changelog

---------

Co-authored-by: Arjen <[email protected]>
Co-authored-by: Benjamin Reich <[email protected]>
Co-authored-by: Arjen van Bochoven <[email protected]>

* First merge of latest munkilib

* Update prefs.py

* Update reportcommon.py

* Update report_broken_client

* Update munkireport-runner

now with more options! :D

* Add osutils.py

* Add wrappers.py

* Update reportcommon.py

* Clean up logging

* Add removal of python 2 check

* Update install_script.php

* Update composer.json

* Update base autopkg recipe

 and do not set base url in post installs script

* Fix uploading of data

* Update reportcommon.py

* Summary

* Fixing issue munkireport#1496

* Cleanup and fix CPU arch checks

* Update composer

* Change error to warning on duplicate runs

* Clean up post install script

* Update CHANGELOG.md

* Update munkireport-runner

* Update reportcommon.py

* Update MR version

* Python 3 support files

* Update reportcommon.py

* Fix issue reading binary files

* Fix for installing via script

* Updated munkilib files to 6.2.1

* Add more config output

* Update munkireport-runner

* Module Marketplace now shows pre-release modules

* Module Marketplace now check module search paths

* Fix Python 2 remover and uninstallation options

* More —show-config results

* Update munkireport-runner

* Update munkireport-runner

* Clean up System Status page

* Add `post_max_size` and `upload_max_filesize`

* Now detects and mitigates low PHP upload size

* PHP 8 Compatibility

* Update for PHP 8

* Update CHANGELOG.md

* Update reportcommon.py

* Update reportcommon.py

* Update Dashboard.php

* Remove default installed 3rd party modules

* PHP 8 compatibility fixes

* Update README.md

* Update munkireport-runner

* Update to use doctrine/dbal

* Update reportcommon.py

* Update SeedCommand.php

* Update processor.stub

---------

Co-authored-by: Arjen van Bochoven <[email protected]>
Co-authored-by: Per Olofsson <[email protected]>
Co-authored-by: Arjen <[email protected]>
Co-authored-by: Benjamin Reich <[email protected]>
Co-authored-by: Arjen van Bochoven <[email protected]>

.env.example

@@ -10,7 +10,7 @@
 APP_ENV=local
 
 # Encryption key, Re-generate with `php please key:generate`
-APP_KEY=base64:ZZxdn6dbVTL7cpzcmALmsSG0uwa+b07KilEHDweqXyQ=  # Was: ENCRYPTION_KEY
+APP_KEY= # Was: ENCRYPTION_KEY
 
 # Show debugging information when an error occurs
 APP_DEBUG=true
@@ -43,7 +43,7 @@ APP_DEBUG=true
 # figure out how to rewrite urls in the server of your choice.
 
 # This variable is deprecated, since .htaccess/mod_rewrite is mandatory.
-INDEX_PAGE="index.php?"
+#INDEX_PAGE="index.php?"
 
 # URI_PROTOCOL (Deprecated)
 # -------------------------

Dockerfile

@@ -11,12 +11,25 @@ LABEL architecture="x86_64" \
 	  License="MIT" \
 	  version="v6.0.0-alpha"
 
-RUN arch="$(dpkg --print-architecture)" && args="--with-libdir=lib/x86_64-linux-gnu/" && \
-    case "$arch" in \
-        *arm*) args="" ;; \
-    esac && \
-    docker-php-ext-configure ldap "$args" && \
-    docker-php-ext-install -j$(nproc) curl pdo_mysql soap ldap zip
+#RUN arch="$(dpkg --print-architecture)" && args="--with-libdir=lib/x86_64-linux-gnu/" && \
+#    case "$arch" in \
+#        *arm*) args="" ;; \
+#    esac && \
+#    docker-php-ext-configure ldap "$args" && \
+#    docker-php-ext-install -j$(nproc) curl pdo_mysql soap ldap zip
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y libldap2-dev \
+    libcurl4-openssl-dev \
+    libzip-dev \
+    unzip \
+    zlib1g-dev \
+    libxml2-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
+    docker-php-ext-install -j$(nproc) curl pdo_mysql soap ldap zip opcache
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
 ENV COMPOSER_HOME /tmp
@@ -31,15 +44,18 @@ COPY --chown=www-data:www-data . $APP_DIR
 COPY --chown=www-data:www-data --from=frontend /usr/src/app/public/ $APACHE_DOCUMENT_ROOT/
 WORKDIR $APP_DIR
 
-COPY --from=composer:2.2.6 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2.6 /usr/bin/composer /usr/local/bin/composer
+COPY build/composer-local.example.json $APP_DIR/composer.local.json
 
 USER www-data
 
 RUN composer install --no-dev && \
     composer dumpautoload -o && \
     composer clear-cache
 
-RUN mkdir -p app/db
+# You should not use this directory for SQLite as Laravel defines one. However, it is provided for backwards compatibility.
+RUN mkdir -p app/db && \
+	touch app/db/db.sqlite
 
 RUN php please migrate
 

public/assets/js/munkireport.comment.js

@@ -129,7 +129,7 @@ $(document).on('appReady', function(e, lang) {
 				data.html = data.html || 'No comments'
 				me.html(data.html)
 					.after($('<button>')
-						.addClass('btn btn-default hidden-print')
+						.addClass('btn btn-default btn-outline-secondary')
 						.data('section', section)
 						.click(addComment)
 						.text('Edit'))

resources/views/layouts/mr.blade.php

@@ -255,8 +255,10 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel"></h4>
+                <h5 class="modal-title" id="myModalLabel"></h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </div>
             <div class="modal-body">
                 ...