Skip to content

Commit

Permalink
Merge branch 'main' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
SaiedKazemi committed Dec 19, 2023
2 parents 95c00c0 + a20d0fb commit dec2ba8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.4"

services:
# Web Entrypoint
Expand Down Expand Up @@ -34,7 +34,7 @@ services:

# Control-Plane & Data-Plane
clickhouse:
image: docker.io/clickhouse/clickhouse-server:22
image: docker.io/clickhouse/clickhouse-server:22.8
labels:
# ClickHouse HTTP (8123)
- traefik.http.routers.clickhouse-http.entrypoints=web
Expand All @@ -51,7 +51,7 @@ services:
- "./configuration/clickhouse/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh"

postgres:
image: postgres
image: postgres:16.1
environment:
POSTGRES_USER: iris
POSTGRES_PASSWORD: iris
Expand All @@ -69,7 +69,7 @@ services:
- "traefik.tcp.routers.redis.rule=HostSNI(`*`)"

minio:
image: docker.io/minio/minio:latest
image: docker.io/minio/minio:RELEASE.2023-08-31T15-31-16Z
command: "server /data --console-address :9001"
labels:
# API
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/iris-agent.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN apt-get update \
zstd \
&& rm -rf /var/lib/apt/lists/*

RUN curl -L https://github.com/dioptra-io/caracal/releases/download/v0.15.1/caracal-linux-amd64 > /usr/bin/caracal \
RUN curl -L https://github.com/dioptra-io/caracal/releases/download/v0.15.2/caracal-linux-amd64 > /usr/bin/caracal \
&& chmod +x /usr/bin/caracal

WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion docs/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ To be able to access them from your own machine, you need to add the following e
You also need caracal in your $PATH if you intend to run Iris locally:
```bash
# Use caracal-macos-amd64 for macOS
curl -L https://github.com/dioptra-io/caracal/releases/download/v0.15.1/caracal-linux-amd64 > /usr/bin/caracal
curl -L https://github.com/dioptra-io/caracal/releases/download/v0.15.2/caracal-linux-amd64 > /usr/bin/caracal
chmod +x /usr/bin/caracal
```

Expand Down

0 comments on commit dec2ba8

Please sign in to comment.