Skip to content

Commit 9d5e5b7

Browse files
csandanovcsandanov
committed
Replace elasticsearch/kibana with opensearch
1 parent f1fcf4b commit 9d5e5b7

File tree

3 files changed

+75
-46
lines changed

3 files changed

+75
-46
lines changed

‎.env‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,10 @@ VALKEY_TAG=8-1.0.0
7070

7171
VARNISH_TAG=6.0-4.19.1
7272

73-
### --- ELASTICSEARCH ---
73+
### --- OPENSEARCH ---
7474

75-
ELASTICSEARCH_TAG=7-5.19.14
76-
77-
### --- KIBANA ---
78-
79-
KIBANA_TAG=7-5.19.14
75+
OPENSEARCH_TAG=2
76+
OPENSEARCH_ADMIN_PASSWORD=VERY%@bad123password
8077

8178
### --- SOLR ---
8279

‎README.md‎

Lines changed: 57 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
## Introduction
66

7-
Docker4Python is a set of docker images optimized for Python applications (suitable for Django). Use `compose.yml` file from the [latest stable release](https://github.com/wodby/docker4python/releases) to spin up local environment on Linux, Mac OS X and Windows.
7+
Docker4Python is a set of docker images optimized for Python applications (suitable for Django). Use
8+
`compose.yml` file from the [latest stable release](https://github.com/wodby/docker4python/releases) to spin up local environment on Linux, Mac OS X and Windows.
89

910
- Read the docs on [**how to use**](https://wodby.com/docs/stacks/python/local#usage)
1011
- Ask questions on [Discord](http://discord.wodby.com/)
@@ -15,25 +16,25 @@ Docker4Python is a set of docker images optimized for Python applications (suita
1516

1617
The Python stack consist of the following containers:
1718

18-
| Container | Versions | Image | ARM64 support | Enabled by default |
19-
|-----------------|-----------------------------|-----------------------|---------------|--------------------|
20-
| [Nginx] | 1.27, 1.26 | [wodby/nginx] | ✓ | ✓ |
21-
| [Python] | 3.13, 3.12, 3.11, 3.10, 3.9 | [wodby/python] | ✓ | ✓ |
22-
| [PostgreSQL] | 17, 16, 15, 14, 13 | [wodby/postgres] | ✓ | ✓ |
23-
| [Valkey] | 8, 7 | [wodby/valkey] | ✓ | ✓ |
24-
| [MariaDB] | 11.4, 10.6, 10.5, 10.4 | [wodby/mariadb] | ✓ | |
25-
| [Node.js] | 22, 20, 18 | [wodby/node] | ✓ | |
26-
| [Varnish] | 6.0 | [wodby/varnish] | ✓ | |
27-
| [Solr] | 9 | [wodby/solr] | ✓ | |
28-
| [Elasticsearch] | 7 | [wodby/elasticsearch] | | |
29-
| [Kibana] | 7 | [wodby/kibana] | | |
30-
| [Memcached] | 1 | [wodby/memcached] | | |
31-
| [Rsyslog] | latest | [wodby/rsyslog] | | |
32-
| Gotenberg | latest | [gotenberg/gotenberg] | ✓ | ✓ |
33-
| Mailpit | latest | [axllent/mailpit] | ✓ | ✓ |
34-
| [OpenSMTPD] | 7 | [wodby/opensmtpd] | ✓ | |
35-
| Adminer | 4.6 | [wodby/adminer] | ✓ | |
36-
| Traefik | latest | [_/traefik] | ✓ | ✓ |
19+
| Container | Versions | Image | ARM64 support | Enabled by default |
20+
|-----------------------|-----------------------------|-------------------------------------------|---------------|--------------------|
21+
| [Nginx] | 1.27, 1.26 | [wodby/nginx] | ✓ | ✓ |
22+
| [Python] | 3.13, 3.12, 3.11, 3.10, 3.9 | [wodby/python] | ✓ | ✓ |
23+
| [PostgreSQL] | 17, 16, 15, 14, 13 | [wodby/postgres] | ✓ | ✓ |
24+
| [Valkey] | 8, 7 | [wodby/valkey] | ✓ | ✓ |
25+
| [MariaDB] | 11.4, 10.6, 10.5, 10.4 | [wodby/mariadb] | ✓ | |
26+
| [Node.js] | 22, 20, 18 | [wodby/node] | ✓ | |
27+
| [Varnish] | 6.0 | [wodby/varnish] | ✓ | |
28+
| [Solr] | 9 | [wodby/solr] | ✓ | |
29+
| OpenSearch | 2 | [opensearchproject/opensearch] | ✓ | |
30+
| OpenSearch Dashboards | 2 | [opensearchproject/opensearch-dashboards] | ✓ | |
31+
| [Memcached] | 1 | [wodby/memcached] | ✓ | |
32+
| [Rsyslog] | latest | [wodby/rsyslog] | ✓ | |
33+
| Gotenberg | latest | [gotenberg/gotenberg] | ✓ | ✓ |
34+
| Mailpit | latest | [axllent/mailpit] | ✓ | ✓ |
35+
| [OpenSMTPD] | 7 | [wodby/opensmtpd] | ✓ | |
36+
| Adminer | 4.6 | [wodby/adminer] | ✓ | |
37+
| Traefik | latest | [_/traefik] | ✓ | ✓ |
3738

3839
## Documentation
3940

@@ -43,9 +44,14 @@ Full documentation is available at https://wodby.com/docs/stacks/python/local
4344

4445
Images tags format is `[VERSION]-[STABILITY_TAG]` where:
4546

46-
`[VERSION]` is the _version of an application_ (without patch version) running in a container, e.g. `wodby/nginx:1.15-x.x.x` where Nginx version is `1.15` and `x.x.x` is a stability tag. For some images we include both major and minor version like Python `2.5`, for others we include only major like Valkey `7`.
47+
`[VERSION]` is the _version of an application_ (without patch version) running in a container, e.g.
48+
`wodby/nginx:1.15-x.x.x` where Nginx version is `1.15` and
49+
`x.x.x` is a stability tag. For some images we include both major and minor version like Python
50+
`2.5`, for others we include only major like Valkey `7`.
4751

48-
`[STABILITY_TAG]` is the _version of an image_ that corresponds to a git tag of the image repository, e.g. `wodby/mariadb:10.2-3.3.8` has MariaDB `10.2` and stability tag [`3.3.8`](https://github.com/wodby/mariadb/releases/tag/3.3.8). New stability tags include patch updates for applications and image's fixes/improvements (new env vars, orchestration actions fixes, etc). Stability tag changes described in the corresponding a git tag description. Stability tags follow [semantic versioning](https://semver.org/).
52+
`[STABILITY_TAG]` is the _version of an image_ that corresponds to a git tag of the image repository, e.g.
53+
`wodby/mariadb:10.2-3.3.8` has MariaDB `10.2` and stability tag [
54+
`3.3.8`](https://github.com/wodby/mariadb/releases/tag/3.3.8). New stability tags include patch updates for applications and image's fixes/improvements (new env vars, orchestration actions fixes, etc). Stability tag changes described in the corresponding a git tag description. Stability tags follow [semantic versioning](https://semver.org/).
4955

5056
We highly encourage to use images only with stability tags.
5157

@@ -64,35 +70,60 @@ We regularly update images used in this stack and release them together, see [re
6470

6571
This project is licensed under the MIT open source license.
6672

67-
[Elasticsearch]: https://wodby.com/docs/stacks/elasticsearch
68-
[Kibana]: https://wodby.com/docs/stacks/elasticsearch
6973
[MariaDB]: https://wodby.com/docs/stacks/python/containers#mariadb
74+
7075
[Memcached]: https://wodby.com/docs/stacks/python/containers#memcached
76+
7177
[Nginx]: https://wodby.com/docs/stacks/python/containers#nginx
78+
7279
[Node.js]: https://wodby.com/docs/stacks/python/containers#node
80+
7381
[OpenSMTPD]: https://wodby.com/docs/stacks/python/containers#opensmtpd
82+
7483
[PostgreSQL]: https://wodby.com/docs/stacks/python/containers#postgres
84+
7585
[Valkey]: https://wodby.com/docs/stacks/python/containers#valkey
86+
7687
[Rsyslog]: https://wodby.com/docs/stacks/python/containers#rsyslog
88+
7789
[Python]: https://wodby.com/docs/stacks/python/containers#python
90+
7891
[Solr]: https://wodby.com/docs/stacks/solr
92+
7993
[Varnish]: https://wodby.com/docs/stacks/python/containers#varnish
8094

8195
[_/traefik]: https://hub.docker.com/_/traefik
96+
8297
[gotenberg/gotenberg]: https://hub.docker.com/r/gotenberg/gotenberg
98+
8399
[blackfire/blackfire]: https://hub.docker.com/r/blackfire/blackfire
100+
84101
[axllent/mailpit]: https://hub.docker.com/r/axllent/mailpit
102+
85103
[wodby/adminer]: https://hub.docker.com/r/wodby/adminer
86-
[wodby/elasticsearch]: https://github.com/wodby/elasticsearch
87-
[wodby/kibana]: https://github.com/wodby/kibana
104+
88105
[wodby/mariadb]: https://github.com/wodby/mariadb
106+
89107
[wodby/memcached]: https://github.com/wodby/memcached
108+
90109
[wodby/nginx]: https://github.com/wodby/nginx
110+
91111
[wodby/node]: https://github.com/wodby/node
112+
92113
[wodby/opensmtpd]: https://github.com/wodby/opensmtpd
114+
93115
[wodby/postgres]: https://github.com/wodby/postgres
116+
94117
[wodby/valkey]: https://github.com/wodby/valkey
118+
95119
[wodby/rsyslog]: https://hub.docker.com/r/wodby/rsyslog
120+
96121
[wodby/python]: https://github.com/wodby/python
122+
97123
[wodby/solr]: https://github.com/wodby/solr
124+
98125
[wodby/varnish]: https://github.com/wodby/varnish
126+
127+
[opensearchproject/opensearch]: https://hub.docker.com/r/opensearchproject/opensearch
128+
129+
[opensearchproject/opensearch-dashboards]: https://hub.docker.com/r/opensearchproject/opensearch-dashboards

‎compose.yml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,24 @@ services:
106106
# labels:
107107
# - "traefik.http.services.${PROJECT_NAME}_solr.loadbalancer.server.port=8983"
108108
# - "traefik.http.routers.${PROJECT_NAME}_solr.rule=Host(`solr.${PROJECT_BASE_URL}`)"
109-
110-
# elasticsearch:
111-
# image: wodby/elasticsearch:$ELASTICSEARCH_TAG
109+
110+
# opensearch:
111+
# image: opensearchproject/opensearch:$OPENSEARCH_TAG
112+
# environment:
113+
# "discovery.type": "single-node"
114+
# "plugins.security.disabled": true
115+
# OPENSEARCH_INITIAL_ADMIN_PASSWORD: $OPENSEARCH_ADMIN_PASSWORD
116+
#
117+
# opensearch-dashboards:
118+
# image: opensearchproject/opensearch-dashboards:$OPENSEARCH_TAG
112119
# environment:
113-
# ES_JAVA_OPTS: "-Xms500m -Xmx500m"
114-
# ulimits:
115-
# memlock:
116-
# soft: -1
117-
# hard: -1
118-
119-
# kibana:
120-
# image: wodby/kibana:$KIBANA_TAG
120+
# OPENSEARCH_HOSTS: '["http://opensearch:9200"]'
121+
# DISABLE_SECURITY_DASHBOARDS_PLUGIN: true
121122
# depends_on:
122-
# - elasticsearch
123+
# - opensearch
123124
# labels:
124-
# - "traefik.http.services.${PROJECT_NAME}_kibana.loadbalancer.server.port=5601"
125-
# - "traefik.http.routers.${PROJECT_NAME}_kibana.rule=Host(`kibana.${PROJECT_BASE_URL}`)"
125+
# - "traefik.http.services.${PROJECT_NAME}_opensearch.loadbalancer.server.port=5601"
126+
# - "traefik.http.routers.${PROJECT_NAME}_opensearch.rule=Host(`opensearch.${PROJECT_BASE_URL}`)"
126127

127128
# memcached:
128129
# container_name: "${PROJECT_NAME}_memcached"

0 commit comments

Comments
 (0)