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:45 UTC
[syncope] branch master updated (1820311eb6 -> 0795d30074)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
from 1820311eb6 Support multi-arch docker builds (#373)
new f546d44929 [SYNCOPE-1694] Fix ClassPathScanImplementationLookup
new 0795d30074 Adjusting for non-amd64 Docker builds
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/syncope/common/lib/types/IdRepoImplementationType.java | 2 +-
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 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[syncope] 02/02: Adjusting for non-amd64 Docker builds
Posted by il...@apache.org.
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
[syncope] 01/02: [SYNCOPE-1694] Fix ClassPathScanImplementationLookup
Posted by il...@apache.org.
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 f546d449293b9a2cdb1f1598c30f715bcf456530
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Sep 2 15:34:14 2022 +0200
[SYNCOPE-1694] Fix ClassPathScanImplementationLookup
---
.../org/apache/syncope/common/lib/types/IdRepoImplementationType.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/types/IdRepoImplementationType.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/types/IdRepoImplementationType.java
index eb374be271..5ffaabf9d0 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/types/IdRepoImplementationType.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/types/IdRepoImplementationType.java
@@ -50,7 +50,7 @@ public final class IdRepoImplementationType {
Pair.of(PASSWORD_RULE, "org.apache.syncope.core.persistence.api.dao.PasswordRule"),
Pair.of(TASKJOB_DELEGATE, "org.apache.syncope.core.provisioning.api.job.SchedTaskJobDelegate"),
Pair.of(LOGIC_ACTIONS, "org.apache.syncope.core.provisioning.api.LogicActions"),
- Pair.of(VALIDATOR, "org.apache.syncope.core.persistence.api.attrvalue.validation.Validator"),
+ Pair.of(VALIDATOR, "org.apache.syncope.core.persistence.api.attrvalue.validation.PlainAttrValueValidator"),
Pair.of(RECIPIENTS_PROVIDER, "org.apache.syncope.core.provisioning.api.notification.RecipientsProvider"),
Pair.of(AUDIT_APPENDER, "org.apache.syncope.core.logic.audit.AuditAppender"),
Pair.of(ITEM_TRANSFORMER, "org.apache.syncope.core.provisioning.api.data.ItemTransformer"));