X-Git-Url: https://jfr.im/git/uguu.git/blobdiff_plain/ccf3370ab5b5e15fcf861283690d353e520e6b6b..e2c8b5721de9b6db65c258a36fff292c7f3f5b60:/docker/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4296072..368cf65 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,17 +1,23 @@
-FROM alpine:latest
+FROM php:8.1-alpine
 
 ARG VERSION
 
+
+RUN apk add --no-cache $PHPIZE_DEPS \
+	php-fpm zlib-dev libzip-dev libgomp; \
+	docker-php-ext-install intl pcntl gd exif zip pdo mysql dom; \
+    apk del $PHPIZE_DEPS; \
+    rm -rf /tmp/pear;
+
 # Install the needed software
-RUN apk add --no-cache curl nginx php8-fpm php8-sqlite3 php8-opcache sqlite nodejs git npm bash build-base supervisor
+RUN apk add --no-cache sqlite nodejs git npm bash build-base supervisor curl wget nginx
+#php8-fileinfo php8-pdo php8-tokenizer php8-dom php8-iconv php8-xml php8-simplexml \
+#php8-sqlite3 php8-opcache php8-mbstring php8-phar php8-openssl
 
 # Create the www-data user and group
-RUN set -x ; \
-  addgroup -g 82 -S www-data ; \
-  adduser -u 82 -D -S -G www-data www-data && exit 0 ; exit 1
-
-# Link php bin
-RUN ln -s /usr/bin/php8 /usr/bin/php
+#RUN set -x ; \
+#  addgroup -g 82 -S www-data ; \
+#  adduser -u 82 -D -S -G www-data www-data && exit 0 ; exit 1
 
 # Copy supervisor conf file
 COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
@@ -21,41 +27,46 @@ WORKDIR  /var/www/
 
 COPY docker/docker-entrypoint.sh .
 
-# Download Uguu
-ADD https://git.pomf.se/Pomf/uguu/archive/v${VERSION}.tar.gz v${VERSION}.tar.gz
-RUN tar xvf v${VERSION}.tar.gz
+# Decompress into Docker
+COPY docker/uguuForDocker.tar.gz /var/www/
+RUN mkdir /var/www/uguu
+RUN tar -xvf uguuForDocker.tar.gz -C uguu
 
 # Create the needed directories
-RUN mkdir /var/www/uguu/dist && \
-    mkdir /var/www/db && \
-    mkdir /var/www/files
+RUN mkdir /var/www/files && \
+    mkdir /var/www/db
 
 # Create the Sqlite DB
-RUN sqlite3 /var/www/db/uguu.sq3 -init /var/www/uguu/sqlite_schema.sql && \
+RUN sqlite3 /var/www/db/uguu.sq3 -init /var/www/uguu/src/static/dbSchemas/sqlite_schema.sql && \
     chown -R www-data:www-data /var/www && \
     chmod -R 775 /var/www/
 
 # Fix script paths
-RUN chmod a+x /var/www/uguu/checkdb.sh && \
-    chmod a+x /var/www/uguu/checkfiles.sh && \
-    sed -i 's#/path/to/files/#/var/www/uguu/files/#g' /var/www/uguu/checkfiles.sh && \
-    sed -i 's#/path/to/db/uguu.sq3#/var/www/db/uguu.sq3#g' /var/www/uguu/checkdb.sh
+RUN chmod a+x /var/www/uguu/src/static/scripts/checkdb.sh && \
+    chmod a+x /var/www/uguu/src/static/scripts/checkfiles.sh && \
+    sed -i 's#/path/to/files/#/var/www/uguu/files/#g' /var/www/uguu/src/static/scripts/checkfiles.sh && \
+    sed -i 's#/path/to/db/uguu.sq3#/var/www/db/uguu.sq3#g' /var/www/uguu/src/static/scripts/checkdb.sh
 
 # Add scripts to cron
-RUN echo "0,30 * * * * bash /var/www/uguu/checkfiles.sh" >> /var/spool/cron/crontabs/www-data && \
-    echo "0,30 * * * * bash /var/www/uguu/checkdb.sh" >> /var/spool/cron/crontabs/www-data
+RUN echo "0,30 * * * * bash /var/www/uguu/src/static/scripts/checkfiles.sh" >> /var/spool/cron/crontabs/www-data && \
+    echo "0,30 * * * * bash /var/www/uguu/src/static/scripts/checkdb.sh" >> /var/spool/cron/crontabs/www-data
 
 # Copy Nginx Server conf
-COPY docker/uguu.conf /etc/nginx/http.d/
+COPY docker/nginx/uguu.conf /etc/nginx/http.d/
 
 # Copy SSL certs
 COPY docker/ssl /etc/ssl
 
+# Copy PHP config
+COPY docker/php/php.ini /etc/php8/
+COPY docker/php/www.conf /etc/php8/php-fpm.d/
+RUN mkdir /var/run/php
+
 # Copy Uguu config
-COPY dist.json /var/www/uguu/dist.json
+COPY src/config.json /var/www/uguu/config.json
 
 # Give permissions to www-data
-RUN chown -R www-data:www-data /run /var/lib/php8 /var/lib/nginx /var/log/nginx /var/log/php8 /etc/nginx /etc/php8
+RUN chown -R www-data:www-data /run /var/lib/nginx /var/log/nginx /etc/nginx /etc/php8 /var/log/php8 /var/run/php
 
 # Change user to www-data
 USER www-data