From 72d1a6919a612b4b997d506b499434c760d4a162 Mon Sep 17 00:00:00 2001
From: Szymon Radziszewski <117299684+sradziszewski@users.noreply.github.com>
Date: Wed, 18 Sep 2024 15:44:50 +0200
Subject: [PATCH] OIS-48: Updated dev and service-base image version (#104)

* OIS-48: Updated dev and service-base image version

* OIS-48: Updated rsyslog image version
---
 Dockerfile                        | 2 +-
 docker-compose.builder.yml        | 6 +++---
 docker-compose.erd-generation.yml | 2 +-
 docker-compose.override.yml       | 2 +-
 4 files changed, 6 insertions(+), 6 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.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'
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"