From 6ca144b621726315ff84ae06db3be4cc8a4cfc40 Mon Sep 17 00:00:00 2001 From: Szymon Radziszewski Date: Wed, 18 Sep 2024 16:43:19 +0200 Subject: [PATCH] OIS-48: Updated dev, rsyslog and service-base image version --- Dockerfile | 2 +- docker-compose.builder.yml | 6 +++--- docker-compose.erd-generation.yml | 2 +- docker-compose.override.yml | 2 +- docker-compose.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e8fb846..0c6bb70 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 build/consul /consul \ No newline at end of file diff --git a/docker-compose.builder.yml b/docker-compose.builder.yml index bfa31a3..eba3054 100644 --- a/docker-compose.builder.yml +++ b/docker-compose.builder.yml @@ -1,7 +1,7 @@ version: "2" services: builder: - image: openlmis/dev:8 + image: openlmis/dev:10 links: - db - log @@ -15,7 +15,7 @@ services: JAVA_OPTS: '-Dlogging.config=/logback.xml' env_file: .env sonar: - image: openlmis/dev:8 + image: openlmis/dev:10 links: - db - log @@ -36,6 +36,6 @@ services: image: openlmis/postgres:12-debezium env_file: .env log: - image: openlmis/rsyslog:1 + image: openlmis/rsyslog:3 volumes: - '../logs/hapifhir-service:/var/log' diff --git a/docker-compose.erd-generation.yml b/docker-compose.erd-generation.yml index 9951825..b8b8d9a 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/hapifhir-service:/var/log' diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 5462a26..c8dd709 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,7 +1,7 @@ version: "2" services: hapifhir: - image: openlmis/dev:8 + image: openlmis/dev:10 ports: - "5005:5005" - "8080:8080" diff --git a/docker-compose.yml b/docker-compose.yml index f6a706e..1b85647 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,6 @@ services: image: openlmis/postgres:12-debezium env_file: .env log: - image: openlmis/rsyslog:1 + image: openlmis/rsyslog:3 volumes: - '../logs/hapifhir-service:/var/log'