From 44da6c0b30521f86eaf74ac8be0de8280bdbab00 Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Thu, 23 Apr 2020 20:35:48 +0700 Subject: [PATCH] Docker is updated with new 5.0.0-M4 OM release --- Dockerfile | 27 ++++++++++++--------------- README.md | 14 +++++++------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0957c13..a573c31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,26 +69,23 @@ RUN cat /etc/issue \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ \ - && wget https://builds.apache.org/view/M-R/view/OpenMeetings/job/openmeetings/lastSuccessfulBuild/artifact/openmeetings-server/target/apache-openmeetings-${OM_VERSION}-SNAPSHOT.tar.gz -O ${work}/om.tar.gz \ + && wget "https://archive.apache.org/dist/openmeetings/${OM_VERSION}/bin/apache-openmeetings-${OM_VERSION}.tar.gz" -O ${work}/om.tar.gz \ + && wget "https://archive.apache.org/dist/openmeetings/${OM_VERSION}/bin/apache-openmeetings-${OM_VERSION}.tar.gz.asc" -O ${work}/om.asc \ + && export GNUPGHOME="$(mktemp -d)" \ + && for server in hkp://ipv4.pool.sks-keyservers.net:80 \ + hkp://ha.pool.sks-keyservers.net:80 \ + hkp://pgp.mit.edu:80 \ + hkp://keyserver.pgp.com:80 \ + ; do \ + gpg --keyserver "$server" --recv-keys 8456901E && break || echo "Trying new server..." \ + ; done \ + && gpg --batch --verify ${work}/om.asc ${work}/om.tar.gz \ && tar -xzf ${work}/om.tar.gz --strip-components=1 -C ${OM_HOME}/ \ - && rm -rf ${work}/om.tar.gz \ + && rm -rf ${GNUPGHOME} ${work}/om.asc ${work}/om.tar.gz \ && wget https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_J_VER}/mysql-connector-java-${MYSQL_J_VER}.jar -P ${OM_HOME}/webapps/openmeetings/WEB-INF/lib \ && wget https://repo1.maven.org/maven2/com/ibm/db2/jcc/${DB2_J_VER}/jcc-${DB2_J_VER}.jar -P ${OM_HOME}/webapps/openmeetings/WEB-INF/lib \ && sed -i 's|||g' /etc/ImageMagick-6/policy.xml -# && wget "https://archive.apache.org/dist/openmeetings/${OM_VERSION}/bin/apache-openmeetings-${OM_VERSION}.tar.gz" -O ${work}/om.tar.gz \ -# && wget "https://archive.apache.org/dist/openmeetings/${OM_VERSION}/bin/apache-openmeetings-${OM_VERSION}.tar.gz.asc" -O ${work}/om.asc \ -# && export GNUPGHOME="$(mktemp -d)" \ -# && for server in hkp://ipv4.pool.sks-keyservers.net:80 \ -# hkp://ha.pool.sks-keyservers.net:80 \ -# hkp://pgp.mit.edu:80 \ -# hkp://keyserver.pgp.com:80 \ -# ; do \ -# gpg --keyserver "$server" --recv-keys 8456901E && break || echo "Trying new server..." \ -# ; done \ -# && gpg --batch --verify ${work}/om.asc ${work}/om.tar.gz \ -# && rm -rf ${GNUPGHOME} ${work}/om.asc ${work}/om.tar.gz \ - WORKDIR ${work} COPY scripts/*.sh ./ diff --git a/README.md b/README.md index d9c2d4c..99b154f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # openmeetings-docker -Docker image for OM (version 5.0.0-M3, WebRTC *SEMI-STABLE*) +Docker image for OM (version 5.0.0-M4, WebRTC *SEMI-STABLE*) Please use _releases_ @@ -27,7 +27,7 @@ Please use _releases_ ### to run (full) OM: ``` -docker run -i --rm --expose=5443 --expose=8888 -p 5443:5443 -p 8888:8888 apache/openmeetings:5.0.0-M3.1 +docker run -i --rm --expose=5443 --expose=8888 -p 5443:5443 -p 8888:8888 apache/openmeetings:5.0.0-M4 ``` ### to run (mini) OM: @@ -38,7 +38,7 @@ docker run -p 5443:5443 \ -e OM_DB_USER=db_user \ -e OM_DB_PASS=secret_pass \ --mount type=bind,source=/opt/omdata,target=/opt/omdata \ - -it apache/openmeetings:min-5.0.0-M3 + -it apache/openmeetings:min-5.0.0-M4 ``` > Please Specify `TURN*` parameters in case users from other networks are expected @@ -72,14 +72,14 @@ AUTH token as password This version has no DB and Kurento server, both should be passed via environment See below ``` -docker build -t apache/openmeetings:min-5.0.0-M3 . -docker push apache/openmeetings:min-5.0.0-M3 +docker build -t apache/openmeetings:min-5.0.0-M4 . +docker push apache/openmeetings:min-5.0.0-M4 ``` ### to build full: ``` -docker build -t apache/openmeetings:5.0.0-M3 --build-arg BUILD_TYPE=full . -docker push apache/openmeetings:5.0.0-M3 +docker build -t apache/openmeetings:5.0.0-M4 --build-arg BUILD_TYPE=full . +docker push apache/openmeetings:5.0.0-M4 ``` ### to run (full) OM (locally built):