From a690426f8986646ca2eb6a17395d7ed16fa76e8c Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 16 Aug 2023 09:33:42 +0200 Subject: [PATCH 1/3] upgrade to debian 12 --- docker/cygnus-ngsi/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile index b59261793..84c0a3c3f 100644 --- a/docker/cygnus-ngsi/Dockerfile +++ b/docker/cygnus-ngsi/Dockerfile @@ -16,7 +16,7 @@ # For those usages not covered by the GNU Affero General Public License please contact with iot_support at tid dot es # -FROM debian:11.6-slim +FROM debian:12.1-slim ARG GITHUB_ACCOUNT=telefonicaid ARG GITHUB_REPOSITORY=fiware-cygnus @@ -256,7 +256,7 @@ ENV FLUME_HOME "/opt/apache-flume" ENV FLUME_TGZ "apache-flume-${FLUME_VER}-bin.tar.gz" ENV FLUME_URL "https://archive.apache.org/dist/flume/${FLUME_VER}/${FLUME_TGZ}" -ENV JAVA_VERSION "1.11.0" +ENV JAVA_VERSION "1.17.0" COPY / ${CYGNUS_HOME} @@ -269,16 +269,16 @@ RUN \ apt-get -y update && \ apt-get -y upgrade && \ # Install dependencies - apt-get -y install openjdk-11-jdk curl git python2 maven && \ + apt-get -y install openjdk-17-jdk curl git python3 maven && \ # Add Cygnus user adduser ${CYGNUS_USER} && \ export JAVA_HOME=/usr/lib/jvm/java-${JAVA_VERSION}-openjdk-amd64 && \ - export MAVEN_OPTS="-Xmx2048M -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -Dfile.encoding=UTF-8 -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.useIncrementalCompilation=false -DdependencyLocationsEnabled=false -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled" && \ + export MAVEN_OPTS="-Xmx2048M -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -Dfile.encoding=UTF-8 -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.useIncrementalCompilation=false -DdependencyLocationsEnabled=false -XX:+TieredCompilation -XX:TieredStopAtLevel=1" && \ export MAVEN_ARGS="-B -T8" && \ # For debug Maven export MAVEN_ARGS="${MAVEN_ARGS} -X -e -Dmaven.compiler.verbose=true" && \ echo "INFO: Getting apache preferred site and obtain URLs for Maven and Flume..." && \ - APACHE_DOMAIN="$(curl -s 'https://www.apache.org/dyn/closer.cgi?as_json=1' | python2 -c 'import json,sys;obj=json.load(sys.stdin);print obj["preferred"]')" \ + APACHE_DOMAIN="$(curl -s 'https://www.apache.org/dyn/closer.cgi?as_json=1' | python3 -c 'import json,sys;obj=json.load(sys.stdin);print obj["preferred"]')" \ || APACHE_DOMAIN="http://archive.apache.org/dist/" && \ echo -e $'INFO: Java version <'${JAVA_VERSION}'>\n'$(java -version)'\nINFO: Apache domain <'${APACHE_DOMAIN}'>\nINFO: URL MAVEN <'${MVN_URL}'>\nINFO: URL FLUME <'${FLUME_URL}'>' && \ echo "INFO: Download and install Flume..." && \ @@ -316,14 +316,14 @@ RUN \ rm -rf /root/.m2 && rm -rf ${FLUME_HOME}/docs && rm -rf ${CYGNUS_HOME}/doc && rm -f /*.tar.gz ${CYGNUS_HOME}/*.tar.gz && \ # Cleanup apt-get clean && \ - apt-get -y remove python2 git && \ + apt-get -y remove python3 git && \ apt-get -y autoremove --purge && \ # FIXME: from now on, old cleanup in CentOS 8. Should be reviewed... # FIXME #2113: Fix java errors and warnings. Original script was breaking in CentOS 8 #echo "INFO: Java runtime not needs JAVA_HOME... Unsetting..." && \ #unset JAVA_HOME && \ - #yum erase -y git java-${JAVA_VERSION}-openjdk-devel python2 && \ - #yum erase -y git python2 && \ + #yum erase -y git java-${JAVA_VERSION}-openjdk-devel python && \ + #yum erase -y git python && \ #rpm -qa redhat-logos gtk2 pulseaudio-libs libvorbis jpackage* groff alsa* atk cairo libX* | xargs -r rpm -e --nodeps && \ # FIXME #2113: disabled step 'rpm --rebuilddb', doesn't work in CentOS8 ? #yum clean all && rpm --rebuilddb && rm -rf /var/lib/yum/yumdb && rm -rf /var/lib/yum/history && \ From f9d5c2c4826973fbe9ee22834877119e5a255a8b Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 16 Aug 2023 13:11:11 +0200 Subject: [PATCH 2/3] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 4d695a238..d2bc46577 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,4 +1,5 @@ - [cygnus-common][SQL] Fix expiration records tablename used by delete and select (#2265) - [cygnus-common][SQL] Fix expiration records select with a limit to avoid java out of memory error (#2273) - [cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2270, #2201 reopens for Postgis) +- [docker] UPGRADE: Debian version from 11.6 to 12.1 in Dockerfile From 7728210a27410d9bde526408d4ae50723cf61ba1 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 24 Aug 2023 08:21:19 +0200 Subject: [PATCH 3/3] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index d2bc46577..e73683d9e 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,5 +1,5 @@ - [cygnus-common][SQL] Fix expiration records tablename used by delete and select (#2265) - [cygnus-common][SQL] Fix expiration records select with a limit to avoid java out of memory error (#2273) - [cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2270, #2201 reopens for Postgis) -- [docker] UPGRADE: Debian version from 11.6 to 12.1 in Dockerfile +- [cygnus-ngsi] UPGRADE: Debian version from 11.6 to 12.1 in Dockerfile