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

Update Lightstreamer to version 7.0.1 #4486

Merged
merged 1 commit into from
Jun 22, 2018
Merged

Update Lightstreamer to version 7.0.1 #4486

merged 1 commit into from
Jun 22, 2018

Conversation

gfinocchiaro
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 7967189..2527cb3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,8 +8,8 @@ lightstreamer:7.0
 lightstreamer:7.0-alpine
 lightstreamer:7.0-jre8
 lightstreamer:7.0-jre8-alpine
-lightstreamer:7.0.0
-lightstreamer:7.0.0-alpine
-lightstreamer:7.0.0-jre8
-lightstreamer:7.0.0-jre8-alpine
+lightstreamer:7.0.1
+lightstreamer:7.0.1-alpine
+lightstreamer:7.0.1-jre8
+lightstreamer:7.0.1-jre8-alpine
 lightstreamer:latest
diff --git a/lightstreamer_7.0-alpine/Dockerfile b/lightstreamer_7.0-alpine/Dockerfile
index e3a84be..125ac63 100644
--- a/lightstreamer_7.0-alpine/Dockerfile
+++ b/lightstreamer_7.0-alpine/Dockerfile
@@ -4,7 +4,7 @@ FROM openjdk:8-jre-alpine
 LABEL maintainer="Lightstreamer Server Development Team <support@lightstreamer.com>"
 
 # Set environment variables to identify the right Lightstreamer version
-ENV LIGHTSTREAMER_VERSION 7_0_0_20180228
+ENV LIGHTSTREAMER_VERSION 7_0_1_20180614
 ENV LIGHTSTREAMER_URL_DOWNLOAD http://www.lightstreamer.com/repo/distros/Lightstreamer_${LIGHTSTREAMER_VERSION}.tar.gz
 
 # Set the temporary working dir
@@ -16,24 +16,19 @@ RUN set -ex; \
                    gnupg \
                    tar \
                    curl \
-
 # Import Lighstreamer's public key
         && gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 9B90BFD14309C7DA5EF58D7D4A8C08966F29B4D2 \
-
 # Download the distribution from the Lightstreamer site, verify the signature, and unpack
         &&  set -ex; \
                curl -fSL -o Lightstreamer.tar.gz ${LIGHTSTREAMER_URL_DOWNLOAD} \
                && curl -fSL -o Lightstreamer.tar.gz.asc ${LIGHTSTREAMER_URL_DOWNLOAD}.asc \
                && gpg --batch --verify Lightstreamer.tar.gz.asc Lightstreamer.tar.gz \
                && tar -xvf Lightstreamer.tar.gz --strip-components=1 \
-
 # Replace the fictitious jdk path with the JAVA_HOME environment variable in the launch script file
                && sed -i -- 's/\/usr\/jdk1.8.0/$JAVA_HOME/' bin/unix-like/LS.sh \
-
 # Adjust the logging configuration in order to log only on standard output.
                && sed -i -e '123,$s/<appender-ref ref="LSDailyRolling" \/>/<appender-ref ref="LSConsole" \/>/' \
                          -e '/<appender-ref ref="LSDailyRolling" \/>/ d' conf/lightstreamer_log_conf.xml \
-
 # Finally, remove no longer needed packages and files
                && apk del .deps \
                && rm Lightstreamer.tar.gz Lightstreamer.tar.gz.asc
diff --git a/lightstreamer_latest/Dockerfile b/lightstreamer_latest/Dockerfile
index 8ab588f..000b325 100644
--- a/lightstreamer_latest/Dockerfile
+++ b/lightstreamer_latest/Dockerfile
@@ -7,7 +7,7 @@ LABEL maintainer="Lightstreamer Server Development Team <support@lightstreamer.c
 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 9B90BFD14309C7DA5EF58D7D4A8C08966F29B4D2
 
 # Set environment variables to identify the right Lightstreamer version and edition
-ENV LIGHTSTREAMER_VERSION 7_0_0_20180228
+ENV LIGHTSTREAMER_VERSION 7_0_1_20180614
 ENV LIGHTSTREAMER_URL_DOWNLOAD http://www.lightstreamer.com/repo/distros/Lightstreamer_${LIGHTSTREAMER_VERSION}.tar.gz
 
 # Set the temporary working dir
@@ -19,14 +19,11 @@ RUN set -ex; \
         && curl -fSL -o Lightstreamer.tar.gz.asc ${LIGHTSTREAMER_URL_DOWNLOAD}.asc \
         && gpg --batch --verify Lightstreamer.tar.gz.asc Lightstreamer.tar.gz \
         && tar -xvf Lightstreamer.tar.gz --strip-components=1 \
-
-# Replace replace the fictitious jdk path with the JAVA_HOME environment variable in the launch script file
+# Replace the fictitious jdk path with the JAVA_HOME environment variable in the launch script file
         && sed -i -- 's/\/usr\/jdk1.8.0/$JAVA_HOME/' bin/unix-like/LS.sh \
-
 # Adjust the logging configuration in order to log only on standard output
         && sed -i -e '123,$s/<appender-ref ref="LSDailyRolling" \/>/<appender-ref ref="LSConsole" \/>/' \
                   -e '/<appender-ref ref="LSDailyRolling" \/>/ d' conf/lightstreamer_log_conf.xml \
-
 # Finally, remove no longer needed files
         && rm Lightstreamer.tar.gz Lightstreamer.tar.gz.asc

@yosifkit
Copy link
Member

Build test of #4486; 4a2a8c2; amd64 (lightstreamer):

$ bashbrew build lightstreamer:6.0.3
Building bashbrew/cache:fecb3d4afa639b14af926e1be1fedba427c6a2d5a1c6e5169e674a84cdc692ed (lightstreamer:6.0.3)
Tagging lightstreamer:6.0.3
Tagging lightstreamer:6.0

$ test/run.sh lightstreamer:6.0.3
testing lightstreamer:6.0.3
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build lightstreamer:6.1.0
Building bashbrew/cache:2ccc34da045665d3728a383321b271ab6887a42737c4c2caa222cf1b843467bf (lightstreamer:6.1.0)
Tagging lightstreamer:6.1.0
Tagging lightstreamer:6.1
Tagging lightstreamer:6

$ test/run.sh lightstreamer:6.1.0
testing lightstreamer:6.1.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build lightstreamer:7.0.1-jre8
Building bashbrew/cache:7533e15188fea760b37398ae1527c8993a4b11a1263bd8c500568341e872e499 (lightstreamer:7.0.1-jre8)
Tagging lightstreamer:7.0.1-jre8
Tagging lightstreamer:7.0-jre8
Tagging lightstreamer:7.0.1
Tagging lightstreamer:7.0
Tagging lightstreamer:7
Tagging lightstreamer:latest

$ test/run.sh lightstreamer:7.0.1-jre8
testing lightstreamer:7.0.1-jre8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build lightstreamer:7.0.1-jre8-alpine
Building bashbrew/cache:94c0fbe4d599b537977316f27ce6c17ad97b4efafdcbf2ff67bdbc785ae13238 (lightstreamer:7.0.1-jre8-alpine)
Tagging lightstreamer:7.0.1-jre8-alpine
Tagging lightstreamer:7.0-jre8-alpine
Tagging lightstreamer:7.0.1-alpine
Tagging lightstreamer:7.0-alpine

$ test/run.sh lightstreamer:7.0.1-jre8-alpine
testing lightstreamer:7.0.1-jre8-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit f557e4c into docker-library:master Jun 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants