Commit Graph

99 Commits

Author SHA1 Message Date
Lee
5799511916 Merge pull request 'Switch image conversion to Imagick' (#3) from development into master
All checks were successful
/ docker (push) Successful in 2m5s
Reviewed-on: #3
2023-07-06 01:35:42 +00:00
49499b8013 use imagick for image conversion (should be a bit faster)
All checks were successful
/ docker (push) Successful in 2m3s
2023-07-06 02:34:51 +01:00
29620ea48b add imagick
All checks were successful
/ docker (push) Successful in 2m0s
2023-07-06 02:28:20 +01:00
4ebb8fafe2 update dev action name
All checks were successful
/ docker (push) Successful in 2m6s
2023-07-06 01:07:35 +01:00
Lee
7bd835de54 Merge pull request 'add dev image' (#2) from development into master
All checks were successful
/ docker (push) Successful in 1m56s
Reviewed-on: #2
2023-07-06 00:06:11 +00:00
1ea65d4c84 add dev image
All checks were successful
/ docker (push) Successful in 1m52s
2023-07-06 01:04:32 +01:00
dff024aac4 cleanup start script - fixed env vars. future test work will be done in a dev branch
All checks were successful
/ docker (push) Successful in 1m57s
2023-07-06 01:03:16 +01:00
bb0761bb55 attempt 5.5
All checks were successful
/ docker (push) Successful in 1m53s
2023-07-06 00:56:27 +01:00
28dd26e873 attempt 5
All checks were successful
/ docker (push) Successful in 1m53s
2023-07-06 00:53:03 +01:00
8e18e29b26 attempt 4.5
All checks were successful
/ docker (push) Successful in 1m50s
2023-07-06 00:48:27 +01:00
8ba2958e6b attempt #4
All checks were successful
/ docker (push) Successful in 1m45s
2023-07-06 00:44:07 +01:00
063a5a4829 attempt #3
All checks were successful
/ docker (push) Successful in 2m5s
2023-07-06 00:36:22 +01:00
d54dd75263 attempt #2
All checks were successful
/ docker (push) Successful in 1m47s
2023-07-06 00:32:42 +01:00
3e88f2c311 attempt #1 of fixing env vars
All checks were successful
/ docker (push) Successful in 2m3s
2023-07-06 00:23:22 +01:00
Lee
0c7ba87f43 re-add comments to docker compose
All checks were successful
/ docker (push) Successful in 1m45s
2023-07-05 16:30:28 +00:00
Lee
53d80a492d Update docker-compose.yml
All checks were successful
/ docker (push) Successful in 1m54s
2023-07-05 16:26:52 +00:00
Lee
1b0e896800 Update docker-compose.yml
All checks were successful
/ docker (push) Successful in 1m54s
2023-07-05 16:26:42 +00:00
Lee
bd05bf0768 Update docker-compose.yml
All checks were successful
/ docker (push) Successful in 1m58s
2023-07-05 16:23:54 +00:00
56993060ee not sure why or how this fixed docker compose, but it did
All checks were successful
/ docker (push) Successful in 1m47s
2023-07-05 17:19:32 +01:00
6d950baa69 add auto clean 2023-07-05 17:19:18 +01:00
5584bad1aa bump ubuntu version
All checks were successful
/ docker (push) Successful in 1m52s
2023-07-05 16:57:12 +01:00
e9246302c5 update comment
All checks were successful
/ docker (push) Successful in 1m40s
2023-07-05 16:24:50 +01:00
5638948721 add more build options
All checks were successful
/ docker (push) Successful in 1m46s
2023-07-05 16:20:57 +01:00
4a8604b7a9 update variable order
All checks were successful
/ docker (push) Successful in 1m40s
2023-07-05 16:09:58 +01:00
79f4b8ee3a add env var support
All checks were successful
/ docker (push) Successful in 1m45s
2023-07-05 01:49:59 +01:00
e18239d5bf fix the fixing of the fix kind
All checks were successful
/ docker (push) Successful in 1m38s
2023-07-05 01:38:41 +01:00
08161a90d0 maybe fix env vars?
Some checks failed
/ docker (push) Has been cancelled
2023-07-05 01:37:42 +01:00
cae4d4f051 use env vars for secrets
All checks were successful
/ docker (push) Successful in 1m34s
2023-07-05 01:08:00 +01:00
b6fd907373 add 404 for unknown files
All checks were successful
/ docker (push) Successful in 1m40s
2023-07-05 01:01:54 +01:00
1770795f16 change default secret key to a variable 2023-07-05 00:52:36 +01:00
f45a186b42 fix comment 2023-07-05 00:51:24 +01:00
45d4af2b1f fix nginx file
All checks were successful
/ docker (push) Successful in 1m38s
2023-07-05 00:50:30 +01:00
0c354b30d5 make the random string generator more random - fixing being able to predict the file id more easily
All checks were successful
/ docker (push) Successful in 1m51s
2023-07-05 00:44:51 +01:00
a56fe5d619 add a check to disallow uploading files using the default secret key
All checks were successful
/ docker (push) Successful in 1m44s
2023-07-05 00:41:33 +01:00
d9da3eb9ab make it so nginx will only execute php on the upload script. This fixes the uploader from being able to upload any php script and that being able to be executed.
All checks were successful
/ docker (push) Successful in 1m47s
2023-07-05 00:38:53 +01:00
7efee12364 update readme
All checks were successful
/ docker (push) Successful in 2m20s
2023-07-04 21:26:05 +01:00
feda337c14 Merge branch 'master' of https://git.fascinated.cc/Fascinated/sharex-php-uploader
All checks were successful
/ docker (push) Successful in 2m39s
2023-07-04 21:23:52 +01:00
a397881c08 re-add manual install steps 2023-07-04 21:23:51 +01:00
Lee
c4f108cd7b Update README.md
All checks were successful
/ docker (push) Successful in 2m7s
2023-07-04 20:13:59 +00:00
0fc5115a27 update readme
All checks were successful
/ docker (push) Successful in 1m49s
2023-07-04 18:27:58 +01:00
3c78628fc1 rename uploader file
All checks were successful
/ docker (push) Successful in 1m44s
2023-07-04 18:26:45 +01:00
9831dc155c add logo asset
All checks were successful
/ docker (push) Successful in 1m48s
2023-07-04 18:08:45 +01:00
c47ef5c434 change image docker compose 2023-07-04 18:08:39 +01:00
3fdaa9219d fix actions?
All checks were successful
/ docker (push) Successful in 2m44s
2023-07-04 17:58:13 +01:00
0db4b9c48b yes?
Some checks failed
/ docker (ubuntu-latest:20.04, 2.38.4) (push) Has been cancelled
2023-07-04 17:56:59 +01:00
084b8b9a82 add dockerhub image
Some checks failed
/ docker (ubuntu-latest, 2.38.4) (push) Has been cancelled
2023-07-04 17:56:28 +01:00
efc46e56a8 fix files showing the raw binary data? 2023-07-04 17:46:31 +01:00
41ea1378ef files are fucky maybe this will fix? 2023-07-04 17:42:02 +01:00
0655f4d5df add perms fix 2023-07-04 17:32:14 +01:00
f94034e70e ples work 2023-07-04 17:28:09 +01:00