resolving conflicts

2023-10-23 05:39:31 -03:00
parent c4d6a254cc 7474e836b6
commit 274c0bc692
19 changed files with 101 additions and 32 deletions
@@ -1,5 +1,5 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-FROM ubuntu:focal
+FROM ubuntu:jammy

 RUN rm /bin/sh && ln -s /bin/bash /bin/sh