mirror of
https://codeberg.org/angestoepselt/refund-form.git
synced 2025-05-24 14:46:16 +00:00
Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f61810fc2 | |||
| 029b884321 | |||
| 0cedb9d89d | |||
| 817ed574ef | |||
| 6e0e4d7a3a | |||
|
|
f8d17aa029 | ||
|
|
f8215c2fde | ||
|
|
2885e0e7ee |
14 changed files with 30 additions and 30 deletions
|
|
@ -12,4 +12,7 @@ steps:
|
|||
repo: codeberg.org/angestoepselt/refund-form
|
||||
tags:
|
||||
- ${DRONE_TAG}
|
||||
- latest
|
||||
- latest
|
||||
trigger:
|
||||
event:
|
||||
- tag
|
||||
17
Dockerfile
17
Dockerfile
|
|
@ -1,7 +1,8 @@
|
|||
ARG ALPINE_VERSION=3.18
|
||||
ARG ALPINE_VERSION=3.20
|
||||
|
||||
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 1.20 & PHP 8.0 based on Alpine Linux."
|
||||
LABEL Description="Forked from https://github.com/TrafeX/docker-php-nginx, Lightweight container with Nginx & PHP based on Alpine Linux."
|
||||
|
||||
# Setup document root
|
||||
WORKDIR /var/www/html
|
||||
|
|
@ -11,16 +12,16 @@ RUN apk update \
|
|||
&& apk add --no-cache \
|
||||
curl \
|
||||
nginx \
|
||||
php82 \
|
||||
php82-fpm \
|
||||
php83 \
|
||||
php83-fpm \
|
||||
supervisor
|
||||
|
||||
# Configure nginx
|
||||
COPY config/nginx.conf /etc/nginx/nginx.conf
|
||||
|
||||
# Configure PHP-FPM
|
||||
COPY config/fpm-pool.conf /etc/php82/php-fpm.d/www.conf
|
||||
COPY config/php.ini /etc/php82/conf.d/custom.ini
|
||||
COPY config/fpm-pool.conf /etc/php83/php-fpm.d/www.conf
|
||||
COPY config/php.ini /etc/php83/conf.d/custom.ini
|
||||
|
||||
RUN mkdir /etc/supervisor.d \
|
||||
&& \
|
||||
|
|
@ -36,10 +37,10 @@ COPY --chown=nobody app/ /var/www/html/
|
|||
USER nobody
|
||||
|
||||
# Expose the port nginx is reachable on
|
||||
EXPOSE 80
|
||||
EXPOSE 8037
|
||||
|
||||
# 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:80/fpm-ping
|
||||
HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8037/fpm-ping
|
||||
2
LICENSE
2
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:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# refund-form
|
||||
[](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:
|
||||
|
||||
|
|
|
|||
2
app/assets/vendor/jquery/jquery-3.6.0.min.js
vendored
2
app/assets/vendor/jquery/jquery-3.6.0.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
app/assets/vendor/jquery/jquery-3.7.1.min.js
vendored
Normal file
2
app/assets/vendor/jquery/jquery-3.7.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
app/assets/vendor/jquery/jquery-3.7.1.min.map
vendored
Normal file
1
app/assets/vendor/jquery/jquery-3.7.1.min.map
vendored
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -91,7 +91,7 @@
|
|||
</div>
|
||||
|
||||
</main>
|
||||
<script src="assets/vendor/jquery/jquery-3.6.0.min.js"></script>
|
||||
<script src="assets/vendor/jquery/jquery-3.7.1.min.js"></script>
|
||||
<script src="assets/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
|
||||
<script src="assets/js/main.js"></script>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -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.6.0.min.js"></script>
|
||||
<script src="assets/vendor/jquery/jquery-3.7.1.min.js"></script>
|
||||
<script src="assets/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
|
||||
<script src="assets/js/main.js"></script>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ http {
|
|||
|
||||
# Default server definition
|
||||
server {
|
||||
listen [::]:80 default_server;
|
||||
listen 80 default_server;
|
||||
listen [::]:8037 default_server;
|
||||
listen 8037 default_server;
|
||||
server_name _;
|
||||
|
||||
sendfile off;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ logfile_maxbytes=0
|
|||
pidfile=/run/supervisord.pid
|
||||
|
||||
[program:php-fpm]
|
||||
command=php-fpm8 -F
|
||||
command=php-fpm83 -F
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
---
|
||||
version: "3"
|
||||
|
||||
services:
|
||||
refund-form:
|
||||
build: .
|
||||
ports:
|
||||
- 8033:80
|
||||
- 8033:80
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
---
|
||||
version: "3"
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
|
||||
services:
|
||||
refund-form:
|
||||
|
|
@ -14,7 +16,3 @@ services:
|
|||
- "traefik.http.routers.refund-secure.tls.certresolver=letsencrypt"
|
||||
networks:
|
||||
- proxy
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue