-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Convertigo official 7.7.0 release. #7281
Conversation
Adds a AKS version with specific Kubernetes tools installed. Still maintains the 7.6.x versions.
Extra variants to images (or adding new images) that are only for a specific vendor platform (Amazon, Azure, Google Cloud, OpenShift, OpenStack, etc) breaks the whole "run anywhere" Docker experience. Images in Official-Images should be platform independent. It is up to image maintainers whether or not to adjust their images to better support the specific needs of a platform in a general way (e.g. docker-library/postgres#359 + docker-library/postgres#448). (Note to future self: comment mostly from docker-solr/docker-solr#130 (comment)) Does convertigo use the azureCLI/kubectl directly? Would they be beneficial to be included all the time? As far as feedback on the additions if they were added to the regular image:
|
yosifkit is totally right and after a team discussion, we let only the default latest version on the official repository. The AKS variant and previous versions maintenance will be on our convertigo public repository.
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index e96d74f..4a3e1bd 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1 @@
convertigo:latest @ amd64
-convertigo:openj9 @ amd64
-convertigo:slim @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 0d8e465..eccfc72 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,3 @@
-convertigo:7.6
-convertigo:7.6-openj9
-convertigo:7.6-slim
-convertigo:7.6.6
-convertigo:7.6.6-openj9
-convertigo:7.6.6-slim
+convertigo:7.7
+convertigo:7.7.0
convertigo:latest
-convertigo:openj9
-convertigo:slim
diff --git a/convertigo_latest/Dockerfile b/convertigo_latest/Dockerfile
index 7d4dbb8..22c60aa 100644
--- a/convertigo_latest/Dockerfile
+++ b/convertigo_latest/Dockerfile
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see<http://www.gnu.org/licenses/>.
-FROM tomcat:7-jdk8-openjdk
+FROM tomcat:9-jdk11-openjdk
MAINTAINER Nicolas Albert nicolasa@convertigo.com
@@ -88,7 +88,7 @@ RUN sed -i.bak \
&& chown -R convertigo:convertigo conf temp work logs \
&& chmod -w conf/*
-ENV CONVERTIGO_VERSION 7.6.6
+ENV CONVERTIGO_VERSION 7.7.0
ENV CONVERTIGO_WAR_URL https://github.com/convertigo/convertigo/releases/download/$CONVERTIGO_VERSION/convertigo-$CONVERTIGO_VERSION.war
diff --git a/convertigo_latest/docker-entrypoint.sh b/convertigo_latest/docker-entrypoint.sh
index 305bc5c..4f29ab6 100755
--- a/convertigo_latest/docker-entrypoint.sh
+++ b/convertigo_latest/docker-entrypoint.sh
@@ -7,7 +7,7 @@ if [ "$1" = "convertigo" ]; then
## function used to cipher passwords
toHash() {
- jrunscript -cp $CATALINA_HOME/webapps/convertigo/WEB-INF/lib/dependencies-*.jar -e "java.lang.System.out.println(org.apache.commons.codec.digest.DigestUtils.sha512Hex(\"$1\"))"
+ echo "System.out.println(org.apache.commons.codec.digest.DigestUtils.sha512Hex(\"$1\"))" | jshell --class-path $CATALINA_HOME/webapps/convertigo/WEB-INF/lib/dependencies-*.jar -
}
## if needed, force the admin and testplatform accounts
diff --git a/convertigo_openj9/Dockerfile b/convertigo_openj9/Dockerfile
deleted file mode 100644
index 528be2e..0000000
diff --git a/convertigo_openj9/docker-entrypoint.sh b/convertigo_openj9/docker-entrypoint.sh
deleted file mode 100755
index 305bc5c..0000000
diff --git a/convertigo_openj9/root-index.html b/convertigo_openj9/root-index.html
deleted file mode 100644
index 06417fc..0000000
diff --git a/convertigo_slim/Dockerfile b/convertigo_slim/Dockerfile
deleted file mode 100644
index 02e941b..0000000
diff --git a/convertigo_slim/docker-entrypoint.sh b/convertigo_slim/docker-entrypoint.sh
deleted file mode 100755
index 305bc5c..0000000
diff --git a/convertigo_slim/root-index.html b/convertigo_slim/root-index.html
deleted file mode 100644
index 06417fc..0000000 |
Build test of #7281; 983a14e; $ bashbrew build convertigo:7.7.0
Using bashbrew/cache:97d1d2aa8e6f6583fad02117a483bd8ec100fc02296e9b3b25243159c52e07b8 (convertigo:7.7.0)
Tagging convertigo:7.7.0
Tagging convertigo:7.7
Tagging convertigo:latest
$ test/run.sh convertigo:7.7.0
testing convertigo:7.7.0
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'convertigo-hello-world' [5/5]....passed
|
Adds a AKS version with specific Kubernetes tools installed.
Still maintains the 7.6.x versions.
Happy new year and thx !