From d94c39fdefa9e7ff9e0dafe41406201a989f2490 Mon Sep 17 00:00:00 2001 From: Szymon Radziszewski Date: Wed, 18 Sep 2024 15:38:30 +0200 Subject: [PATCH 1/3] OIS-48: Updated dev and service-base image version --- Dockerfile | 2 +- docker-compose.builder.yml | 6 +++--- docker-compose.override.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 73dece20c..1ab47f3bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openlmis/service-base:6.1 +FROM openlmis/service-base:7 COPY build/libs/*.jar /service.jar COPY src/main/resources/db/demo-data/*.csv /demo-data/ diff --git a/docker-compose.builder.yml b/docker-compose.builder.yml index f7f8e90ae..ca0cffc6c 100644 --- a/docker-compose.builder.yml +++ b/docker-compose.builder.yml @@ -2,7 +2,7 @@ version: "2" services: builder: - image: openlmis/dev:9 + image: openlmis/dev:10 links: - db - redis @@ -16,7 +16,7 @@ services: env_file: .env sonar: - image: openlmis/dev:9 + image: openlmis/dev:10 links: - db - redis @@ -32,7 +32,7 @@ services: env_file: .env demo-data: - image: openlmis/dev:9 + image: openlmis/dev:10 links: - db - log diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 85804d1e2..58cbe120f 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -2,7 +2,7 @@ version: "2" services: requisition: - image: openlmis/dev:9 + image: openlmis/dev:10 ports: - "8080:8080" - "5005:5005" From fcf1c8478bb3520961d54a048eacec3f515816ae Mon Sep 17 00:00:00 2001 From: Szymon Radziszewski Date: Wed, 18 Sep 2024 15:41:19 +0200 Subject: [PATCH 2/3] OIS-48: Updated rsyslog image version --- docker-compose.erd-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.erd-generation.yml b/docker-compose.erd-generation.yml index 55bc889ac..af8fcc08a 100644 --- a/docker-compose.erd-generation.yml +++ b/docker-compose.erd-generation.yml @@ -15,6 +15,6 @@ services: env_file: .env log: - image: openlmis/rsyslog:1 + image: openlmis/rsyslog:3 volumes: - '../logs/requisition:/var/log' From 68f0da29f1097f87d4dd074c49570b02ad7b9141 Mon Sep 17 00:00:00 2001 From: Szymon Radziszewski Date: Wed, 18 Sep 2024 16:02:47 +0200 Subject: [PATCH 3/3] OIS-48: Updated rsyslog image version --- docker-compose.builder.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.builder.yml b/docker-compose.builder.yml index ca0cffc6c..5956da1b4 100644 --- a/docker-compose.builder.yml +++ b/docker-compose.builder.yml @@ -58,7 +58,7 @@ services: image: redis:3.2.12 log: - image: openlmis/rsyslog:1 + image: openlmis/rsyslog:3 volumes: - '../logs/requisition:/var/log' diff --git a/docker-compose.yml b/docker-compose.yml index af38b1235..340c0b18a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: depends_on: [log] log: - image: openlmis/rsyslog:1 + image: openlmis/rsyslog:3 ports: - "514:514" volumes: