You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2022/09/02 13:34:47 UTC

[syncope] 02/02: Adjusting for non-amd64 Docker builds

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 0795d3007467ebb698fea4534a172d7e78389f53
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Sep 2 15:34:36 2022 +0200

    Adjusting for non-amd64 Docker builds
---
 docker/core/src/main/resources/Dockerfile                           | 2 +-
 docker/src/main/resources/docker-compose/docker-compose-all.yml     | 2 +-
 docker/src/main/resources/docker-compose/docker-compose-mariadb.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/core/src/main/resources/Dockerfile b/docker/core/src/main/resources/Dockerfile
index f6227c2734..4339170ba9 100644
--- a/docker/core/src/main/resources/Dockerfile
+++ b/docker/core/src/main/resources/Dockerfile
@@ -45,6 +45,6 @@ COPY startup.sh /opt/syncope/bin
 RUN chmod 755 /opt/syncope/bin/startup.sh
 CMD ["/opt/syncope/bin/startup.sh"]
 
-RUN apt-get update && apt-get -y install wait-for-it
+RUN curl -o /usr/local/bin/wait-for-it https://github.com/vishnubob/wait-for-it/blob/master/wait-for-it.sh && chmod 755 /usr/local/bin/wait-for-it
 
 EXPOSE 8080
diff --git a/docker/src/main/resources/docker-compose/docker-compose-all.yml b/docker/src/main/resources/docker-compose/docker-compose-all.yml
index e924b700cd..0699045dca 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-all.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-all.yml
@@ -24,7 +24,7 @@ version: '3.3'
 
 services:
    keymaster:
-     image: zookeeper:3.7.0
+     image: zookeeper:3.8.0
      restart: always
 
    db:
diff --git a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
index 663b049c61..4d3633a9b6 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
@@ -21,7 +21,7 @@ version: '3.3'
 
 services:
    db:
-     image: mariadb:10.6
+     image: mariadb:10
      restart: always
      environment:
        MYSQL_ROOT_PASSWORD: password