Claire
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
David Roetzel
7d136feccf
Bump version to v4.4.2 ( #35498 )
2025-07-24 07:51:56 +00:00
Claire
e2a867507c
Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream
2025-07-10 01:10:32 +02:00
Claire
e9170e2de1
Bump version to v4.4.1 ( #35329 )
2025-07-09 16:22:25 +00:00
Claire
f7d1d73073
Merge commit 'b628a98d323902cdcc08fb8d612887dff4dbcd89' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a new user setting, directly next to a glitch-soc-only one.
The upstream setting would actually replace the glitch-soc one but it is not
fully implemented yet, so have them side by side now.
- `app/views/settings/preferences/appearance/show.html.haml`:
Ditto.
- `docker-compose.yml`:
Conflict due to different registry names. Updated the version while keeping
glitch-soc's registry.
2025-07-08 17:27:19 +02:00
Claire
b628a98d32
Bump version to v4.4.0 ( #35291 )
2025-07-08 14:26:43 +00:00
Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
Lukas Martini
11481df4dc
Fix sidekiq health check in docker-compose for sidekiq 7 ( #34879 )
2025-06-02 07:48:37 +00:00
Claire
49e9a1fe4e
Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream
...
Conflicts:
- `docker-compose.yml`:
Conflict because of different repo names. Updated version.
2025-05-06 16:30:33 +02:00
Claire
fbe9728f36
Bump version to v4.3.8 ( #34626 )
2025-05-06 14:17:07 +00:00
Claire
62237332ed
Switch to glitch-soc docker images in docker-compose ( #3038 )
...
Fixes #3032
2025-04-12 11:49:22 +02:00
Claire
264ecdcc13
Bump version to v4.3.7 ( #34385 )
2025-04-07 09:31:00 +00:00
Claire
7866745a6b
Bump version to v4.3.6 ( #34167 )
2025-03-13 14:27:20 +00:00
Claire
fb34d9c590
Bump version to v4.3.5 ( #34129 )
2025-03-10 17:00:15 +00:00
Claire
cfb473c204
Bump version to v4.4.0-alpha.3 ( #34022 )
2025-02-27 15:32:15 +00:00
Mikkel Ricky
2bfcda172d
Fix documentation URL ( #33728 )
2025-01-27 08:23:53 +00:00
Claire
0aa9bb8130
Bump version to v4.4.0-alpha.2 ( #33615 )
2025-01-16 11:02:54 +00:00
Noel De Martin
5c4e224b66
Comment sidekiq build in docker compose ( #33483 )
2025-01-07 15:40:24 +00:00
Claire
ab133c5e30
Bump version to v4.3.2 ( #33226 )
2024-12-09 09:09:00 +00:00
Claire
e97f4b18ad
Update changelog and docker tags to v4.3.1 ( #32849 )
2024-11-12 08:54:18 +00:00
Claire
c3a38c7d8c
Update changelog and security policy ( #32300 )
2024-10-08 12:24:59 +00:00
Claire
03210085b7
Bump version to 4.3.0-rc.1 ( #32124 )
2024-09-30 10:42:59 +00:00
Claire
3e91c101b3
Bump version to 4.3.0-beta.2 ( #31948 )
2024-09-17 15:42:45 +00:00
Renaud Chaput
04f0468016
Fix streaming image with Docker Compose ( #31615 )
2024-08-27 16:05:19 +00:00
Renaud Chaput
da42e9d446
Fix typo in Compose file ( #31612 )
2024-08-27 12:51:34 +00:00
Michael Stanclift
77c055b78c
Update Docker Compose for 4.3-beta ( #31554 )
2024-08-23 16:00:07 +00:00
Claire
1acbb628b9
Update changelog for v4.2.11 ( #31452 )
2024-08-16 12:52:57 +00:00
Claire
df9e26158d
Bump version to v4.3.0-alpha.5 ( #30920 )
2024-07-04 14:59:54 +00:00
Matt Jankowski
569b7d2f25
Clarify the purpose of separate Docker resources ( #30568 )
2024-06-05 23:54:59 +00:00
Claire
7f808ff6e9
Bump version to v4.3.0-alpha.4 ( #30482 )
2024-05-30 13:34:46 +00:00
Shlee
b8f0a50435
docker-compose.yml version is obsolete ( #30120 )
2024-04-29 17:31:14 +00:00
Claire
5f21a1f5a3
Bump version to v4.3.0-alpha.3 ( #29241 )
2024-02-16 11:06:47 +00:00
Michael Stanclift
272592d16d
Change startup command for Puma in Docker Compose ( #28138 )
2023-12-01 11:06:37 +00:00
Jeong Arm
c0cda1adaf
Let use http_hidden_proxy on docker-compose ( #27054 )
2023-10-17 15:24:45 +02:00
Claire
4fcc026f0f
Bump version to v4.2.0 ( #27017 )
2023-09-21 16:51:32 +02:00
Claire
51768de16e
Bump version to v4.1.6 ( #26272 )
2023-07-31 21:11:25 +02:00
Claire
f2c683336b
Bump version to v4.1.5 ( #26108 )
2023-07-21 21:23:14 +02:00
Renaud Chaput
f9bdaebad2
Use Github Container Registry as the official container image source ( #24113 )
2023-03-15 16:41:13 +01:00
Shlee
159b4edeef
Update docker-compose.yml ( #19063 )
2022-08-27 17:40:46 +02:00
Shlee
cc7cebb79a
Fix for #18637 - Migrate from elasticsearch-oss to elasticsearch basic ( #18643 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2022-06-15 16:35:36 +02:00
Markus Petzsch
e3cebfa457
chore: bump elasticsearch version in docker-compose.yml file; closes #18189 ( #18637 )
2022-06-11 15:34:58 +02:00
Yamagishi Kazutoshi
584d8b977b
Format JSON and YAML using Prettier ( #17823 )
...
* Format JSON and YAML using Prettier
* Add prettier to devDep
2022-03-21 04:46:11 +01:00
Su Yang
10188c7db7
Add healthcheck for sidekiq ( #17365 )
2022-01-26 18:08:49 +01:00
Shlee
ac8ad78e91
[Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stable ( #16947 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2021-11-18 22:00:27 +01:00
Shlee
bc348dbe94
[Dockerfile] Upgrade ElasticSearch-OSS 6.8.10 to 7.10.2 ( #16956 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2021-11-18 21:59:34 +01:00
Shlee
a2ce7508c9
Update docker-compose.yml ( #16489 )
2021-07-11 12:57:31 +02:00
Shlee
91055f497f
Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) ( #14016 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2020-06-10 13:57:30 +02:00
Shlee
328c5a21d7
Update docker-compose.yml ( #13756 )
2020-05-15 11:38:30 +02:00
Matej Ľach
490ff09c5a
increase the postgres container shm_size from 64mb to 256mb ( #13451 )
2020-04-12 16:41:54 +02:00
Yamagishi Kazutoshi
d7268befa8
Add healthcheck endpoint for web ( #11770 )
2019-09-07 02:47:51 +02:00
