Skip to content
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

upgrade to debian 12 #2284

Merged
merged 3 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
@@ -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)
- [cygnus-ngsi] UPGRADE: Debian version from 11.6 to 12.1 in Dockerfile

16 changes: 8 additions & 8 deletions docker/cygnus-ngsi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
AlvaroVega marked this conversation as resolved.
Show resolved Hide resolved
ARG GITHUB_ACCOUNT=telefonicaid
ARG GITHUB_REPOSITORY=fiware-cygnus

Expand Down Expand Up @@ -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}

Expand All @@ -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..." && \
Expand Down Expand Up @@ -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 && \
Expand Down
Loading