.drone.yml

@@ -13,6 +13,3 @@ steps:
     tags:
       - ${DRONE_TAG}
       - latest
-trigger:
-  event:
-    - tag

Dockerfile

@@ -1,8 +1,7 @@
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.18
-
 FROM alpine:${ALPINE_VERSION}
 LABEL Maintainer="Matthias Hemmerich matthias+code@mailbro.de"
-LABEL Description="Forked from https://github.com/TrafeX/docker-php-nginx, Lightweight container with Nginx & PHP based on Alpine Linux."
+LABEL Description="Forked from https://github.com/TrafeX/docker-php-nginx, Lightweight container with Nginx 1.20 & PHP 8.0 based on Alpine Linux."
 
 # Setup document root
 WORKDIR /var/www/html
@@ -12,16 +11,16 @@ RUN apk update \
   && apk add --no-cache \
   curl \
   nginx \
-  php83 \
+  php82 \
-  php83-fpm \
+  php82-fpm \
   supervisor
 
 # Configure nginx
 COPY config/nginx.conf /etc/nginx/nginx.conf
 
 # Configure PHP-FPM
-COPY config/fpm-pool.conf /etc/php83/php-fpm.d/www.conf
+COPY config/fpm-pool.conf /etc/php82/php-fpm.d/www.conf
-COPY config/php.ini /etc/php83/conf.d/custom.ini
+COPY config/php.ini /etc/php82/conf.d/custom.ini
 
 RUN mkdir /etc/supervisor.d \
   && \
@@ -37,10 +36,10 @@ COPY --chown=nobody app/ /var/www/html/
 USER nobody
 
 # Expose the port nginx is reachable on
-EXPOSE 8037
+EXPOSE 80
 
 # Let supervisord start nginx & php-fpm
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor.d/supervisord.conf"]
 
 # Configure a healthcheck to validate that everything is up & running
-HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8037/fpm-ping
+HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Angestöpselt e.V.
+Copyright (c) 2021 angestöpselt e.V.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -1,5 +1,5 @@
 # refund-form
-
+[![Build Status](https://drone.z31.it/api/badges/angestoepselt/refund-form/status.svg)](https://drone.z31.it/angestoepselt/refund-form)
 ## Description
 
 This ist our refund-form for expenses of our members. A small dockerized app, written in php. 
@@ -17,7 +17,7 @@ https://codeberg.org/angestoepselt/-/packages/container/refund-form/latest
 
 The MIT License (MIT)
 
-Copyright © 2021 Angestöpselt e.V.
+Copyright © 2021 angestöpselt e.V.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

app/index.html

@@ -91,7 +91,7 @@
   </div>
 
 </main>
-<script src="assets/vendor/jquery/jquery-3.7.1.min.js"></script>
+<script src="assets/vendor/jquery/jquery-3.6.0.min.js"></script>
 <script src="assets/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
 <script src="assets/js/main.js"></script>
 </body>

app/print.html

@@ -91,9 +91,9 @@
                                 </div>
                             </div>
                             <footer class="onlyprint">
-                                Vorsitzende des Vereins Angestöpselt e.V.: Lukas Seeber, Matthias Hemmerich & Tobias Benra<br>
+                                Vorsitzende des Vereins angestöpselt e.V.: Lukas Seeber, Matthias Hemmerich & Tobias Benra<br>
                                 Anschrift: Zeller Str. 29/31, 97082 Würzburg | Telefon: 0931-663 978 12 | Web: angestoepselt.de<br>
-                                Spendenkonto: Angestöpselt e.V. | Sparkasse Mainfranken Würzburg | IBAN: DE23790500000047309828<br>
+                                Spendenkonto: angestöpselt e.V. | Sparkasse Mainfranken Würzburg | IBAN: DE23790500000047309828<br>
                             </footer>
 
                         </div>
@@ -104,7 +104,7 @@
         </div>
     </div>
 </main>
-<script src="assets/vendor/jquery/jquery-3.7.1.min.js"></script>
+<script src="assets/vendor/jquery/jquery-3.6.0.min.js"></script>
 <script src="assets/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
 <script src="assets/js/main.js"></script>
 </body>

config/nginx.conf

@@ -30,8 +30,8 @@ http {
 
     # Default server definition
     server {
-        listen [::]:8037 default_server;
+        listen [::]:80 default_server;
-        listen 8037 default_server;
+        listen 80 default_server;
         server_name _;
 
         sendfile off;

config/supervisord.conf

@@ -5,7 +5,7 @@ logfile_maxbytes=0
 pidfile=/run/supervisord.pid
 
 [program:php-fpm]
-command=php-fpm83 -F
+command=php-fpm8 -F
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr

docker-compose.example.yml

@@ -1,4 +1,6 @@
 ---
+version: "3"
+
 services:
   refund-form:
     build: .

docker-compose.yml

@@ -1,7 +1,5 @@
 ---
-networks:
+version: "3"
-  proxy:
-    external: true
 
 services:
   refund-form:
@@ -16,3 +14,7 @@ services:
       - "traefik.http.routers.refund-secure.tls.certresolver=letsencrypt"
     networks:
       - proxy
+
+networks:
+  proxy:
+    external: true