From 9dbf0760e8ae42d2c6b9718598e1c77ef88fce68 Mon Sep 17 00:00:00 2001 From: Saied Kazemi Date: Mon, 18 Dec 2023 13:38:25 +0100 Subject: [PATCH 1/2] Use the same container image versions as infrastructure (#170) Iris could not successfully restart after upgrading the Iris server (applying security patches and rebooting) although GitHub can successfully install and run Iris when testing pull requests. This is because the test environment uses different container image versions than the Iris server. This commit changes docker-compose.yml to use the same container image versions that the test environment uses. --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ad68e2d0..92018860 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.4" services: # Web Entrypoint @@ -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 @@ -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 @@ -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 From 8da7596af2a2a7f246537997e759bb86c8a799a0 Mon Sep 17 00:00:00 2001 From: Maxime Mouchet Date: Tue, 19 Dec 2023 14:33:50 +0100 Subject: [PATCH 2/2] agent: upgrade to caracal v0.15.2 to fix mangled lines on stdout --- dockerfiles/iris-agent.dockerfile | 2 +- docs/dev.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/iris-agent.dockerfile b/dockerfiles/iris-agent.dockerfile index 1cb956a7..33bfc10e 100644 --- a/dockerfiles/iris-agent.dockerfile +++ b/dockerfiles/iris-agent.dockerfile @@ -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 diff --git a/docs/dev.md b/docs/dev.md index 71e3c800..abfb88da 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -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 ```