add ci

.build/ci-helper

@@ -0,0 +1,17 @@
+#!/bin/bash
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+VERSION_JSON=$(./get_latest_version.sh)
+NEXTCLOUD_VERSION=$(echo $VERSION_JSON | jq -r .version)
+NEXTCLOUD_URL=$(echo $VERSION_JSON | jq -r .url)
+NEXTCLOUD_FILENAME=$(echo $VERSION_JSON | jq -r .filename)
+
+export NEXTCLOUD_VERSION
+export NEXTCLOUD_URL
+export NEXTCLOUD_FILENAME
+
+echo "Nextcloud Version: $NEXTCLOUD_VERSION"
+echo "Nextcloud URL: $NEXTCLOUD_URL"
+echo "Nextcloud Filename: $NEXTCLOUD_FILENAME"
+
+docker compose $@

.build/compose.yml

@@ -4,9 +4,11 @@ services:
       context: .
       dockerfile: fpm.Dockerfile
       args:
-        - VERSION=29.0.3
-    hostname: fpm
-    image: git.shihaam.dev/dockerfiles/nextcloud/fpm:29.0.3
+        NEXTCLOUD_VERSION: ${NEXTCLOUD_VERSION}
+        NEXTCLOUD_URL: ${NEXTCLOUD_URL}
+        NEXTCLOUD_FILENAME: ${NEXTCLOUD_FILENAME}
+    hostname: nextcloud
+    image: git.shihaam.dev/dockerfiles/nextcloud/fpm:${NEXTCLOUD_VERSION}
   nginx:
     build:
       context: .

.build/entrypoint.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ ! -f /var/www/html/config/config.php ]; then
+  touch /var/www/html/config/CAN_INSTALL
+  cp /var/www/default_config.sample.php /var/www/html/config/config.sample.php
+  echo "Created /var/www/html/config/CAN_INSTALL and config.sample.php because config.php does not exist."
+else
+  echo "config.php exists. No action taken."
+fi
+
+if [ -z "$(ls -A /var/www/html/apps)" ]; then
+    mkdir -p /var/www/html/apps/
+    cp -r /var/www/default_apps/* /var/www/html/apps/
+    echo "Copied default apps to /var/www/html/apps because it was empty."
+else
+  echo "/var/www/html/apps is not empty. No action taken."
+fi
+
+## Set permissions
+chown -R www-data:www-data /var/www/html/
+
+exec "$@"

.build/fpm.Dockerfile

@@ -1,31 +1,39 @@
 FROM git.shihaam.dev/dockerfiles/php-fpm:8.3
 
-LABEL maintainer="Shiham Abdul Rahman <shihaam@shihaam.me>"
-LABEL org.opencontainers.image.source="https://git.shihaam.dev/dockerfiles/nextcloud"
-LABEL org.opencontainers.image.documentation="https://git.shihaam.dev/dockerfiles/nextcloud"
-LABEL org.opencontainers.image.description="A simplified docker image for nextcloud"
+ARG NEXTCLOUD_VERSION
+ARG NEXTCLOUD_URL
+ARG NEXTCLOUD_FILENAME
 
-ARG URL=https://download.nextcloud.com/server/releases/
-ARG VERSION
 WORKDIR /var/www/html
 SHELL ["/bin/bash", "-c"]
 
-# Download, Extract and Delete nextcloud tar.bz2
-RUN curl ${URL}nextcloud-${VERSION}.tar.bz2 -o nextcloud-${VERSION}.tar.bz2 \
- && tar -vxjf nextcloud-${VERSION}.tar.bz2 \
- && mv -v nextcloud/* . \
- && rm -rv nextcloud nextcloud-${VERSION}.tar.bz2
-
 # Installing basic tools
-RUN apt-get update && apt-get install bzip2 zip unzip git gnupg2 ca-certificates lsb-release apt-transport-https wget curl nano vim -y --no-install-recommends \
+RUN apt-get update \
+ && apt-get install {bzip2,zip,unzip,gnupg2,ca-certificates,lsb-release,apt-transport-https,wget,curl,nano} -y --no-install-recommends \
  && apt-get auto-remove -y \
  && apt-get clean -y
 
-# Copy php.ini config
-COPY php.ini /usr/local/etc/php/php.ini
+# Download, Extract and Delete nextcloud tar.bz2
+RUN wget $NEXTCLOUD_URL \
+ && tar -vxjf $NEXTCLOUD_FILENAME \
+ && mv -v nextcloud/* . \
+ && rm -rv nextcloud $NEXTCLOUD_FILENAME
 
-# Install Php stuff
+# install php plugins
 RUN docker-php-ext-install {gd,mysqli,pdo,pdo_mysql,bcmath,calendar,zip,gettext,exif,pcntl,shmop,-j$(nproc),gd,sysvmsg,sysvsem,sysvshm}
 
+## copy default config and apps for setup in entrypoint
+RUN mv /var/www/html/config/config.sample.php /var/www/default_config.sample.php \
+ && mv /var/www/html/apps/ /var/www/default_apps/
+
+# copy php config
+COPY php.ini /usr/local/etc/php/php.ini
+COPY php-fpm.conf /usr/local/etc/php-fpm.conf
+# copy and setup entrypoint
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
 # export volume for nginx to serve static files
 VOLUME /var/www/html
+
+CMD ["php-fpm"]

.build/nginx.conf

@@ -30,7 +30,10 @@ server {
     # set max upload size and increase upload timeout:
     client_max_body_size 4G;
     client_body_timeout 600s;
-    fastcgi_buffers 64 4K;
+    fastcgi_buffers 64 16K;
+    fastcgi_read_timeout 300;
+    fastcgi_send_timeout 300;
+    fastcgi_connect_timeout 300;
 
     # Enable gzip but do not remove ETag headers
     gzip on;

.build/php-fpm.conf

@@ -0,0 +1,21 @@
+pid = /var/run/php-fpm.pid
+error_log = /dev/stderr
+emergency_restart_threshold = 10
+emergency_restart_interval = 1m
+process_control_timeout = 10s
+
+; In www.conf or your pool configuration file
+[www]
+; Process manager settings
+pm = dynamic
+pm.max_children = 50
+pm.start_servers = 5
+pm.min_spare_servers = 5
+pm.max_spare_servers = 35
+pm.max_requests = 500
+
+; Timeout settings
+request_terminate_timeout = 300
+
+[global]
+include=etc/php-fpm.d/*.conf

.gitea/workflows/docker-build.yml

@@ -0,0 +1,37 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  docker:
+    name: Build and Push Docker Images
+    runs-on: builder
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Build Docker images
+        working-directory: .build/prod
+        run: docker compose build
+
+      - name: Login to Docker Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ vars.DOCKER_REGISTRY_URL }}
+          username: ${{ vars.DOCKER_REGISTRY_USER }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+      - name: Push Docker images
+        if: github.event_name != 'pull_request'
+        working-directory: .build/prod
+        run: docker compose push

README.md

@@ -2,35 +2,39 @@
 I dont like official nextcloud docker
 
 
-- `docker-compose.yml`
+- `compose.yml`
 ```yaml
-version: '3.5'
 services:
-#########################
-   app:
-      image: git.shihaam.dev/dockerfiles/nextcloud
-      hostname: nextcloud
+  fpm:
+    image: git.shihaam.dev/dockerfiles/nextcloud/fpm:latest
+    hostname: fpm
     volumes:
-         - ./configs/init:/root/init
-         - ./configs/etc/nginx:/etc/nginx
-         - ./configs/etc/php:/etc/php
-         - ./configs/var/www/html/config:/var/www/html/config
-         - ./logs:/root/logs
-         - ./nextcloud:/var/www/html
-         - ./nextcloud-apps:/var/www/html/apps
-         - /mnt/hdd/nextcloud-data:/var/www/html/data #CHANGE MOUNT POINT FOR THIS
+      - ./nextcloud/config:/var/www/html/config:rw
+      - ./nextcloud/apps:/var/www/html/apps:rw
+      - /mnt/vol0/nextcloud-data:/var/www/html/data:rw
+    depends_on:
+      - mysql
+
+  nginx:
+    image: git.shihaam.dev/dockerfiles/nextcloud/nginx
+    hostname: nginx
     ports:
-         - 8000:80
-#########################
-   db:
-      image: mysql:8
+      - 8003:80
+    volumes_from:
+      - fpm
+    depends_on:
+      - fpm
+
+  mysql:
+    image: mysql:8.0-debian
+    hostname: mysql
     environment:
       MYSQL_DATABASE: nextcloud
       MYSQL_USER: nextcloud
       MYSQL_PASSWORD: nextcloud
       MYSQL_ALLOW_EMPTY_PASSWORD: true
     volumes:
-          - ./database:/var/lib/mysql
+      - ./nextcloud/database:/var/lib/mysql
 ```
 
 - You must use a reverse proxy with SSL before starting to setup, personally i use nginx with certbot. \
@@ -53,5 +57,3 @@ server {
 sudo certbot --nginx -d nextcloud.shihaam.me
 ```
 - Configure your DNS accordingly and then.. thats it, enjoy.
-
-