Merge pull request 'chore(deps): update tj-actions/branch-names action to v8' (#18) from renovate/tj-actions-branch-names-8.x into master

Reviewed-on: #18

.gitea/workflows/upload-image.yaml

@@ -13,14 +13,14 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Get branch name
         id: branch-name
-        uses: tj-actions/branch-names@v7
+        uses: tj-actions/branch-names@v8
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Restore Docker Cache
         uses: actions/cache@v3
@@ -38,10 +38,10 @@ jobs:
           echo "Done"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Repo
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
@@ -54,7 +54,7 @@ jobs:
           key: ${{ runner.os }}-buildx
 
       - name: Build and Push (Latest)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         if: steps.branch-name.outputs.current_branch == 'master'
         with:
           push: true
@@ -64,7 +64,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Build and Push (Other Branches)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         if: steps.branch-name.outputs.current_branch != 'master'
         with:
           push: true

Dockerfile

@@ -1,15 +1,15 @@
 # Stage 1: Build Nginx
-FROM alpine:3.18.4 as builder
+FROM alpine:3.19.1 as builder
 
 # Install build dependencies and required tools
 RUN apk update && apk upgrade && \
-    apk add --no-cache php81 php81-fpm php81-gd build-base pcre-dev openssl-dev zlib-dev linux-headers
+    apk add --no-cache build-base pcre-dev openssl-dev zlib-dev linux-headers
 
 # Download and build the latest version of Nginx from source
 WORKDIR /tmp
-RUN wget https://nginx.org/download/nginx-1.25.2.tar.gz
-RUN tar -xzvf nginx-1.25.2.tar.gz
-WORKDIR /tmp/nginx-1.25.2
+RUN wget https://nginx.org/download/nginx-1.25.3.tar.gz
+RUN tar -xzvf nginx-1.25.3.tar.gz
+WORKDIR /tmp/nginx-1.25.3
 RUN ./configure --prefix=/usr/local/nginx --sbin-path=/usr/local/sbin/nginx --conf-path=/etc/nginx/nginx.conf
 RUN make
 RUN make install
@@ -23,20 +23,26 @@ COPY ./docker/nginx.conf /etc/nginx/nginx.conf
 # Setup scripts
 COPY ./upload.php /tmp/upload.php
 COPY ./docker/start.sh /start.sh
+COPY ./docker/index.html /tmp/index.html
 
-# Stage 2: Create a smaller image
-FROM alpine:3.18.4
+# Copy public directory
+COPY ./public /tmp/public
+
+# Stage 2: Create a smaller production image
+FROM alpine:3.19.1
 
 # Copy Nginx and PHP-FPM binaries and configurations from the builder stage
 COPY --from=builder /usr/local/nginx /usr/local/nginx
+COPY --from=builder /usr/local/sbin/nginx /usr/local/sbin/nginx
 COPY --from=builder /etc/nginx /etc/nginx
-COPY --from=builder /etc/php81 /etc/php81
 COPY --from=builder /tmp/upload.php /tmp/upload.php
+COPY --from=builder /tmp/index.html /tmp/index.html
 COPY --from=builder /start.sh /start.sh
+COPY --from=builder /tmp/public /tmp/public
 
 # Install runtime dependencies
 RUN apk update && apk upgrade && \
-    apk add --no-cache php81 php81-fpm php81-gd
+    apk add --no-cache php81 php81-fpm php81-gd pcre
 
 # Cleanup unnecessary files
 RUN rm -rf /var/cache/apk/*

README.md

@@ -15,7 +15,7 @@ This PHP script allows you to easily upload ShareX screenshots and videos. It in
 ## Installation
 
 1. Copy the `docker-compose.yml` file to your server.
-2. Edit the `docker-compose.yml` file and change `MAX_UPLOAD_SIZE` to the maximum file size you want to allow, and update `./uploads` to where you want to store the files.
+2. Edit the `docker-compose.yml` file and change environment variables to what you need, and update `./uploads` to where you want to store the files.
 3. Run `docker-compose up -d` to start the container.
 4. Go to where the files are stored and edit the variables in `upload.php` to your liking.
 5. Run `docker-compose restart` to restart the container.

docker/index.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>ShareX Uploader</title>
+
+    <!-- TailwindCSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+  </head>
+  <body
+    class="h-screen bg-neutral-900 text-white flex flex-col text-center items-center p-4 gap-2"
+  >
+    <p class="text-blue-400 text-4xl">ShareX Uploader</p>
+    <p class="text-gray-400 text-xl">Created by ImFascinated</p>
+    <div>
+      <a href="https://s.fascinated.cc/s/sharex-uploader">Source</a>
+      <a href="https://s.fascinated.cc/s/gitea">Gitea</a>
+      <a href="https://s.fascinated.cc/s/github">GitHub</a>
+    </div>
+  </body>
+</html>

docker/nginx.conf

@@ -39,6 +39,12 @@ http {
 
     client_max_body_size 500M; # Will get replaced by the environment variable MAX_UPLOAD_SIZE
 
+    # Fallback 404 page
+    location = /not-found.html {
+      internal;
+      root /tmp/public;
+    }
+    
     # Upload endpoint
     location /upload.php {
       try_files $uri =404;
@@ -60,6 +66,8 @@ http {
       open_file_cache_min_uses 1;
       open_file_cache_errors on;
 
+      error_page 404 /not-found.html;
+
       # Serve the file directly from disk
       try_files $uri $uri/ =404;
     }

docker/start.sh

@@ -14,6 +14,14 @@ else
   echo "Upload script was not found, copying it."
 fi
 
+echo "Checking if default index.html exists in /var/www/html"
+if [ -f "/var/www/html/index.html" ]; then
+  echo "Upload script was found, ignoring copy."
+else
+  cp /tmp/index.html /var/www/html
+  echo "Default index.html was not found, copying it."
+fi
+
 # Letting php know that we are running in docker
 echo "env[DOCKER] = true" >> /etc/php81/php-fpm.d/www.conf
 echo "clear_env = no" >> /etc/php81/php-fpm.d/www.conf

public/not-found.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>File Not Found</title>
+
+    <!-- TailwindCSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+  </head>
+  <body
+    class="h-screen bg-neutral-900 text-white flex flex-col text-center justify-center items-center p-4 gap-2"
+  >
+    <p class="text-red-400 text-3xl">404 - File Not Found</p>
+    <p class="text-gray-400 text-xl">
+      We're sorry, the file you requested could not be found.
+    </p>
+  </body>
+</html>

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>Fascinated/renovate-config"
+  ]
+}