commit | 0795d3007467ebb698fea4534a172d7e78389f53 | [log] [tgz] |
---|---|---|
author | Francesco Chicchiriccò <ilgrosso@apache.org> | Fri Sep 02 15:34:36 2022 +0200 |
committer | Francesco Chicchiriccò <ilgrosso@apache.org> | Fri Sep 02 15:34:36 2022 +0200 |
tree | 75a5a3b392183852af6dec1d929c07c33a42a459 | |
parent | f546d449293b9a2cdb1f1598c30f715bcf456530 [diff] |
Adjusting for non-amd64 Docker builds
diff --git a/docker/core/src/main/resources/Dockerfile b/docker/core/src/main/resources/Dockerfile index f6227c2..4339170 100644 --- a/docker/core/src/main/resources/Dockerfile +++ b/docker/core/src/main/resources/Dockerfile
@@ -45,6 +45,6 @@ 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 e924b70..0699045 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 @@ 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 663b049..4d3633a 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 @@ services: db: - image: mariadb:10.6 + image: mariadb:10 restart: always environment: MYSQL_ROOT_PASSWORD: password