Supporting multiple app servers in the skaffold build

entando · Jan 14, 2020 · 75425c4 · 75425c4
1 parent ea404d4
commit 75425c4
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 380 deletions.
diff --git a/Dockerfile.eap b/Dockerfile.eap
@@ -0,0 +1,3 @@
+FROM entando/entando-eap71-base:6.0.0
+COPY target/*.war /opt/eap/standalone/deployments/
+#RUN $ENTANDO_COMMON_PATH/init-derby-from-war.sh
diff --git a/Dockerfile.wildfly b/Dockerfile.wildfly
@@ -0,0 +1,3 @@
+FROM entando/entando-wildfly12-base:6.0.0
+COPY target/*.war /wildfly/standalone/deployments/
+#RUN $ENTANDO_COMMON_PATH/init-derby-from-war.sh
diff --git a/charts/entando-de-app/Makefile b/charts/entando-de-app/Makefile
@@ -36,7 +36,7 @@ ifeq ($(OS),Darwin)
 	sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml
 else ifeq ($(OS),Linux)
 	sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml
-	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/entando\/entando-de-app|" values.yaml
+	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/entando\/entando-de-app-$(JEE_SERVER)|" values.yaml
 	sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml
 else
 	echo "platfrom $(OS) not supported to release from"

diff --git a/charts/entando-de-app/requirements.yaml b/charts/entando-de-app/requirements.yaml
@@ -2,4 +2,4 @@ dependencies:
 - alias: entando-operator
   name: entando-k8s-controller-coordinator
   repository: https://jenkins-x-chartmuseum-jx.apps.serv.run
-  version: 6.0.30
+  version: 6.0.32
diff --git a/charts/maven/.helmignore b/charts/maven/.helmignore
diff --git a/charts/maven/Chart.yaml b/charts/maven/Chart.yaml
diff --git a/charts/maven/Makefile b/charts/maven/Makefile
diff --git a/charts/maven/README.md b/charts/maven/README.md
diff --git a/charts/maven/templates/NOTES.txt b/charts/maven/templates/NOTES.txt
diff --git a/charts/maven/templates/_helpers.tpl b/charts/maven/templates/_helpers.tpl
diff --git a/charts/maven/templates/canary.yaml b/charts/maven/templates/canary.yaml
diff --git a/charts/maven/templates/deployment.yaml b/charts/maven/templates/deployment.yaml
diff --git a/charts/maven/templates/hpa.yaml b/charts/maven/templates/hpa.yaml
diff --git a/charts/maven/templates/ksvc.yaml b/charts/maven/templates/ksvc.yaml
diff --git a/charts/maven/templates/service.yaml b/charts/maven/templates/service.yaml