Merge branch 'master' of https://git.fascinated.cc/Fascinated/sharex-php-uploader

Reviewed-on: #15

.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
 
       - 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

@@ -3,13 +3,13 @@ FROM alpine:3.18.4 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
@@ -24,19 +24,19 @@ COPY ./docker/nginx.conf /etc/nginx/nginx.conf
 COPY ./upload.php /tmp/upload.php
 COPY ./docker/start.sh /start.sh
 
-# Stage 2: Create a smaller image
+# Stage 2: Create a smaller production image
 FROM alpine:3.18.4
 
 # 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 /start.sh /start.sh
 
 # 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.

renovate.json

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