Merge pull request #6 from bluecraank/cleanup_docker

Cleanup docker

Dockerfile

@@ -1,97 +1,31 @@
-FROM php:8.3-apache
-
-LABEL maintainer "blueCraanK"
-ARG NODE_VERSION=20
-
-RUN apt-get update && \
-    apt-get install -y \
-    libjpeg62-turbo-dev \
-    libpng-dev \
-    libzip-dev \
-    ghostscript \
-    git \
-    ca-certificates \
-    curl \
-    gnupg \
-    ffmpeg
-
-RUN mkdir -p /etc/apt/keyrings
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-
-RUN apt-get update && \
-    apt-get install -y \
-    nodejs
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-RUN composer self-update
+#Installiere Alpine, PHP und Nginx
+FROM serversideup/php:8.3-fpm-nginx-alpine
+USER root
 
-# Install PHP extensions
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-RUN chmod +x /usr/local/bin/install-php-extensions && \
-    install-php-extensions pdo_mysql zip bcmath mbstring ldap imagick gd
+# Workdirectory setzen
+WORKDIR /var/www/html
 
-# Clone source code if not downloaded
-RUN rm -rf /var/www/html
-# RUN git clone https://github.com/bluecraank/open-signage.git /var/www/html
-ARG BRANCH=master
-ADD https://api.github.com/repos/bluecraank/open-signage/git/refs/heads/$BRANCH /var/www/version.json
-RUN git clone -b $BRANCH https://github.com/bluecraank/open-signage.git /var/www/html
+# Projekt kopieren
+COPY . /var/www/html
 
+# .env.example kopieren
 COPY .env.example.productive /var/www/html/.env
 
-# Apache configuration
-RUN a2enmod rewrite headers remoteip
-ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
-# Get real remote ip over proxy
-RUN echo "<IfModule remoteip_module>" >> /etc/apache2/conf-available/remoteip.conf
-RUN echo "RemoteIPHeader X-Forwarded-For" >> /etc/apache2/conf-available/remoteip.conf
-RUN echo "RemoteIPInternalProxy 172.18.0.0/16" >> /etc/apache2/conf-available/remoteip.conf
-RUN echo "</IfModule>" >> /etc/apache2/conf-available/remoteip.conf
-RUN a2enconf remoteip
-
-RUN touch /var/www/html/storage/logs/laravel.log
-RUN chown -R www-data:www-data /var/www/html/storage/logs/laravel.log
-RUN chown -R www-data:www-data /var/www/html/
-
-# Install dependencies
-WORKDIR /var/www/html
-RUN composer install --no-dev --optimize-autoloader
-RUN npm install && npm run build
-
-# Artisan commands
+# Packages installieren
+RUN apk add --no-cache --virtual build-depend --update libjpeg-turbo-dev libpng-dev libzip-dev ghostscript openldap npm imagemagick && \
+    echo "TLS_REQCERT never" >> /etc/openldap/ldap.conf && \
+    install-php-extensions ldap imagick gd && \
+    touch /var/www/html/storage/logs/laravel.log && \
+    chown -R www-data:www-data /var/www/html/storage/logs/laravel.log && \
+    chown -R www-data:www-data /var/www/html && \
+    composer install --no-dev --optimize-autoloader && \
+    npm i && \
+    npm run build && \
+    php artisan key:generate && \
+    sed -ri -e 's/<policy domain="resource" name="memory" value="256MiB"\/>/<policy domain="resource" name="memory" value="2GiB"\/>/g' /etc/ImageMagick-7/policy.xml && \
+    sed -ri -e 's/<policy domain="resource" name="map" value="512MiB"\/>/<policy domain="resource" name="map" value="8GiB"\/>/g' /etc/ImageMagick-7/policy.xml && \
+    sed -ri -e 's/<policy domain="resource" name="disk" value="1GiB"\/>/<policy domain="resource" name="disk" value="8GiB"\/>/g' /etc/ImageMagick-7/policy.xml && \
+    apk del build-depend
+
+# User auf www-data setzen
 USER www-data
-WORKDIR /var/www/html
-RUN php artisan config:cache
-RUN php artisan config:clear
-RUN php artisan cache:clear
-RUN php artisan key:generate
-
-# LDAP without certificate
-USER root
-RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
-
-# Allow .htaccess
-RUN sed -ri -e 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf
-
-# Set max_upload_size
-RUN echo "php_value upload_max_filesize 100M" >> /var/www/html/public/.htaccess
-RUN echo "php_value post_max_size 100M" >> /var/www/html/public/.htaccess
-
-# Allow pdf imaging
-RUN sed -ri -e 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="read|write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml
-# change <policy domain="resource" name="disk" value="1GiB"/>
-# to <policy domain="resource" name="disk" value="8GiB"/>
-# more resources for imagick
-RUN sed -ri -e 's/<policy domain="resource" name="memory" value="256MiB"\/>/<policy domain="resource" name="memory" value="2GiB"\/>/g' /etc/ImageMagick-6/policy.xml
-RUN sed -ri -e 's/<policy domain="resource" name="map" value="512MiB"\/>/<policy domain="resource" name="map" value="8GiB"\/>/g' /etc/ImageMagick-6/policy.xml
-RUN sed -ri -e 's/<policy domain="resource" name="disk" value="1GiB"\/>/<policy domain="resource" name="disk" value="8GiB"\/>/g' /etc/ImageMagick-6/policy.xml
-
-
-
-USER root
-RUN chown -R www-data:www-data /var/www/html/

app/Http/Controllers/DeviceController.php

@@ -198,6 +198,11 @@ public function destroy(string $id)
     public function discover(Request $request) {
         $ip = request()->ip();
 
+        // If HTTP_X_FORWARDED_FOR is set, use that instead
+        if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        }
+
         $device = Device::where('ip_address', $ip)->first();
 
         if($device) {