releasing zendserver 2018.0.3 9.1.8 8.5.12 #5752

andrus7k · 2019-04-17T10:16:18Z

releasing zendserver 2018.0.3 9.1.8 8.5.12

yosifkit · 2019-04-17T21:50:28Z

+    && wget http://downloads.zend.com/zendserver/2018.0.3/ZendServer-2018.0.3-RepositoryInstaller-linux.tar.gz \

On the 2018.0 Dockerfile, this needs improvement to include as much verification as possible as described here. Similar to the later line that downloads and verifies zs-init.tar.gz

It looks like the tar.gz as well as its extracted contents are left in the image; if unneeded, they should be deleted in the layer they are created.

tianon · 2019-04-22T22:42:17Z

+    && ./install_zs.sh 7.2 --automatic \
-      zend-server-php-7.2=2018.0.0+b464 \

It appears that this loses the previous version pinning, so it won't be possible for us to rebuild this properly if there's a newer 2018.0.0+bNNN release later unless that .tar.gz file will also be updated for every version bump. Is that something you're OK with?

+    && echo "8b17143a1611a1d7a17d5494876079e300ee730e4e9b585c1b1a821777de2cc2 ZendServer-2018.0.3-RepositoryInstaller-linux.tar.gz" | sha256sum -c - \

This technically works as-is, but it should be either two spaces between or should include a * before the filename, ala:

    && echo "8b17143a1611a1d7a17d5494876079e300ee730e4e9b585c1b1a821777de2cc2 *ZendServer-2018.0.3-RepositoryInstaller-linux.tar.gz" | sha256sum -c - \

Or better yet:

    && echo "8b17143a1611a1d7a17d5494876079e300ee730e4e9b585c1b1a821777de2cc2 *ZendServer-2018.0.3-RepositoryInstaller-linux.tar.gz" | sha256sum --strict --check - \

Also, this whole script seems kind of insane -- why are we downloading a big tarball that contains an installation script that amounts to just apt-key add && apt-get install?

yosifkit · 2019-04-24T21:24:16Z

Diff:

diff --git a/php-zendserver_8.5/Dockerfile b/php-zendserver_8.5/Dockerfile
index d9ba0d2..120e6ba 100644
--- a/php-zendserver_8.5/Dockerfile
+++ b/php-zendserver_8.5/Dockerfile
@@ -1,14 +1,23 @@
 # Zend Server
 #
-# Version 0.2
+# Version 8.5.12+b817
 
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
-RUN apt-key adv --keyserver pgp.mit.edu --recv-key 799058698E65316A2E7A4FF42EAE1437F7D2C623
-RUN echo "deb http://repos.zend.com/zend-server/8.5.10/deb_apache2.4 server non-free" >> /etc/apt/sources.list.d/zend-server.list
-RUN apt-get update && apt-get install -y curl libmysqlclient18 unzip git zend-server-php-5.6=8.5.10+b798 && /usr/local/zend/bin/zendctl.sh stop
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 799058698E65316A2E7A4FF42EAE1437F7D2C623
+COPY zs8_5-apache2_4.list /etc/apt/sources.list.d/zend-server.list
+RUN apt-get update \
+    && apt-get install -y \
+        curl \
+        libmysqlclient20 \
+        unzip \
+        git \
+        zend-server-php-5.6=8.5.12+b817 \
+    && rm -rf /var/lib/apt/lists/* \
+    && /usr/local/zend/bin/zendctl.sh stop
 
-COPY ./zend.lic /etc/
+#Set default license
+COPY ./zend-201904161519.lic /etc/zend.lic
 
 #Make apache drop the HTTP_PROXY header to fix CVE-2016-5385, CVE-2016-5387
 COPY ./drop-http-proxy-header.conf /etc/apache2/conf-available
@@ -25,11 +34,14 @@ RUN curl -fSL -o zs-init.tar.gz "http://repos.zend.com/zs-init/zs-init-docker-${
     && tar xzf zs-init.tar.gz --strip-components=1 -C /usr/local/zs-init \
     && rm zs-init.tar.gz
 
+#Install composer and dependencies for zs-init
 WORKDIR /usr/local/zs-init
-RUN /usr/local/zend/bin/php -r "readfile('https://getcomposer.org/installer');" | /usr/local/zend/bin/php
-RUN /usr/local/zend/bin/php composer.phar update
+RUN /usr/local/zend/bin/php -r "readfile('https://getcomposer.org/installer');" | /usr/local/zend/bin/php \
+    && /usr/local/zend/bin/php composer.phar self-update && /usr/local/zend/bin/php composer.phar update
 
 COPY ./scripts /usr/local/bin
+#Copy Zray docker plugin
+#TODO: Integrate Zray docker plugin into Zend Server
 COPY ./Zray /usr/local/zend/var/plugins/
 
 RUN rm /var/www/html/index.html
diff --git a/php-zendserver_8.5/zend-201904161519.lic b/php-zendserver_8.5/zend-201904161519.lic
new file mode 100644
index 0000000..b3cdd1e
--- /dev/null
+++ b/php-zendserver_8.5/zend-201904161519.lic
@@ -0,0 +1 @@
+{"ZEND_LICENSE_ORDER":"zs-docker","ZEND_LICENSE_KEY":"EKUE9J41801G21BB2C5E2D1552E2F404"}
diff --git a/php-zendserver_8.5/zend.lic b/php-zendserver_8.5/zend.lic
deleted file mode 100644
index 59b6ba7..0000000
diff --git a/php-zendserver_8.5/zs8_5-apache2_4.list b/php-zendserver_8.5/zs8_5-apache2_4.list
new file mode 100644
index 0000000..15ae29d
--- /dev/null
+++ b/php-zendserver_8.5/zs8_5-apache2_4.list
@@ -0,0 +1 @@
+deb http://repos.zend.com/zend-server/8.5.12/deb_apache2.4 server non-free
diff --git a/php-zendserver_9.1/Dockerfile b/php-zendserver_9.1/Dockerfile
index 6c65dde..6e574d3 100644
--- a/php-zendserver_9.1/Dockerfile
+++ b/php-zendserver_9.1/Dockerfile
@@ -1,32 +1,31 @@
 # Zend Server
 #
-# Version 9.1.3+b165
+# Version 9.1.8+b181
 
 FROM ubuntu:16.04
 
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 799058698E65316A2E7A4FF42EAE1437F7D2C623 \
-    && echo "deb http://repos.zend.com/zend-server/9.1/deb_apache2.4 server non-free" >> /etc/apt/sources.list.d/zend-server.list \
-    && apt-get update \
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 799058698E65316A2E7A4FF42EAE1437F7D2C623
+COPY zs9_1-apache2_4.list /etc/apt/sources.list.d/zend-server.list
+RUN apt-get update \
     && apt-get install -y \
+      curl \
       libmysqlclient20 \
       unzip \
       git \
-      curl \
-      net-tools \
-      zend-server-php-7.1=9.1.4+b170 \
+      zend-server-php-7.1=9.1.8+b181 \
     && rm -rf /var/lib/apt/lists/* \
     && /usr/local/zend/bin/zendctl.sh stop
 
 #Set default license
-COPY ./zend.lic /etc/
+COPY ./zend-201904161519.lic /etc/zend.lic
 
 #Make apache drop the HTTP_PROXY header to fix CVE-2016-5385, CVE-2016-5387
 COPY ./drop-http-proxy-header.conf /etc/apache2/conf-available
-RUN  /usr/sbin/a2enconf drop-http-proxy-header \
-     && /usr/sbin/a2enmod headers
+RUN  /usr/sbin/a2enconf drop-http-proxy-header
+RUN  /usr/sbin/a2enmod headers
 
 # "zs-init" is a standard Zend Server cloud initialization package.
-# It has minor tweaks for use within Docker which can be found at https://github.com/zendtech/zs-init/treye/docker
+# It has minor tweaks for use within Docker which can be found at https://github.com/zendtech/zs-init/tree/docker
 ENV ZS_INIT_VERSION 0.3
 ENV ZS_INIT_SHA256 e8d441d8503808e9fc0fafc762b2cb80d4a6e68b94fede0fe41efdeac10800cb
 RUN curl -fSL -o zs-init.tar.gz "http://repos.zend.com/zs-init/zs-init-docker-${ZS_INIT_VERSION}.tar.gz" \
diff --git a/php-zendserver_9.1/zend-201904161519.lic b/php-zendserver_9.1/zend-201904161519.lic
new file mode 100644
index 0000000..b3cdd1e
--- /dev/null
+++ b/php-zendserver_9.1/zend-201904161519.lic
@@ -0,0 +1 @@
+{"ZEND_LICENSE_ORDER":"zs-docker","ZEND_LICENSE_KEY":"EKUE9J41801G21BB2C5E2D1552E2F404"}
diff --git a/php-zendserver_9.1/zend.lic b/php-zendserver_9.1/zend.lic
deleted file mode 100644
index 59b6ba7..0000000
diff --git a/php-zendserver_9.1/zs9_1-apache2_4.list b/php-zendserver_9.1/zs9_1-apache2_4.list
new file mode 100644
index 0000000..008d807
--- /dev/null
+++ b/php-zendserver_9.1/zs9_1-apache2_4.list
@@ -0,0 +1 @@
+deb http://repos.zend.com/zend-server/9.1/deb_apache2.4 server non-free
\ No newline at end of file
diff --git a/php-zendserver_latest/Dockerfile b/php-zendserver_latest/Dockerfile
index 88cfc86..747873b 100644
--- a/php-zendserver_latest/Dockerfile
+++ b/php-zendserver_latest/Dockerfile
@@ -1,32 +1,31 @@
 # Zend Server
 #
-# Version 2018.0.3+b165
+# Version 2018.0.3+b24
 
 FROM ubuntu:16.04
 
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 799058698E65316A2E7A4FF42EAE1437F7D2C623 \
-    && echo "deb http://repos.zend.com/zend-server/2018.0/deb_apache2.4 server non-free" >> /etc/apt/sources.list.d/zend-server.list \
-    && apt-get update \
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 799058698E65316A2E7A4FF42EAE1437F7D2C623
+COPY zs2018_0-apache2_4.list /etc/apt/sources.list.d/zend-server.list
+RUN apt-get update \
     && apt-get install -y \
+      curl \
       libmysqlclient20 \
       unzip \
       git \
-      curl \
-      net-tools \
-      zend-server-php-7.2=2018.0.0+b464 \
+      zend-server-php-7.2=2018.0.3+b24 \
     && rm -rf /var/lib/apt/lists/* \
     && /usr/local/zend/bin/zendctl.sh stop
 
 #Set default license
-COPY ./zend.lic /etc/
+COPY ./zend-201904161519.lic /etc/zend.lic
 
 #Make apache drop the HTTP_PROXY header to fix CVE-2016-5385, CVE-2016-5387
 COPY ./drop-http-proxy-header.conf /etc/apache2/conf-available
-RUN  /usr/sbin/a2enconf drop-http-proxy-header \
-     && /usr/sbin/a2enmod headers
+RUN  /usr/sbin/a2enconf drop-http-proxy-header
+RUN  /usr/sbin/a2enmod headers
 
 # "zs-init" is a standard Zend Server cloud initialization package.
-# It has minor tweaks for use within Docker which can be found at https://github.com/zendtech/zs-init/treye/docker
+# It has minor tweaks for use within Docker which can be found at https://github.com/zendtech/zs-init/tree/docker
 ENV ZS_INIT_VERSION 0.3
 ENV ZS_INIT_SHA256 e8d441d8503808e9fc0fafc762b2cb80d4a6e68b94fede0fe41efdeac10800cb
 RUN curl -fSL -o zs-init.tar.gz "http://repos.zend.com/zs-init/zs-init-docker-${ZS_INIT_VERSION}.tar.gz" \
@@ -37,7 +36,8 @@ RUN curl -fSL -o zs-init.tar.gz "http://repos.zend.com/zs-init/zs-init-docker-${
 
 #Install composer and dependencies for zs-init
 WORKDIR /usr/local/zs-init
-RUN  /usr/local/zend/bin/php /usr/local/zend/bin/composer.phar self-update && /usr/local/zend/bin/php /usr/local/zend/bin/composer.phar update
+RUN /usr/local/zend/bin/php -r "readfile('https://getcomposer.org/installer');" | /usr/local/zend/bin/php \
+    && /usr/local/zend/bin/php composer.phar self-update && /usr/local/zend/bin/php composer.phar update
 
 COPY ./scripts /usr/local/bin 
 #Copy Zray docker plugin
diff --git a/php-zendserver_latest/scripts/run b/php-zendserver_latest/scripts/run
index dad0f7c..c678f9a 100755
--- a/php-zendserver_latest/scripts/run
+++ b/php-zendserver_latest/scripts/run
@@ -26,6 +26,9 @@ usermod -a -G adm zend
 #ZDOCK-15 - allow users to bring their own licenses
 /usr/local/bin/modify_license.sh
 
+#Drop MYSQL_DATABASE if it has no tables
+/usr/local/clear_empty_db.php $MYSQL_DATABASE
+
 /usr/local/zs-init/init.php
 
 echo "Zend Server is ready for use
@@ -50,9 +53,9 @@ WEB_API_KEY_HASH=`/usr/local/zs-init/stateValue.php WEB_API_KEY_HASH`
 #Define Default application
 /usr/local/zend/bin/zs-client.sh applicationDefine --name=default --baseUrl="http://<default-server>:80/" --zskey=$WEB_API_KEY_NAME --zssecret=$WEB_API_KEY_HASH > /dev/null 2>&1
 
-if [[ -n $MYSQL_HOSTNAME && -n $MYSQL_USERNAME && -n $MYSQL_PASSWORD ]]; then
+if [[ -n $MYSQL_HOSTNAME && -n $MYSQL_USERNAME && -n $MYSQL_PASSWORD && -n $NODE_ID ]]; then
 echo "Adding Node Id to DB table for sigterm handler"
-exec /usr/local/bin/nothing $MYSQL_HOSTNAME $MYSQL_PORT $MYSQL_USERNAME $MYSQL_PASSWORD $MYSQL_DBNAME $NODE_ID $WEB_API_KEY_NAME $WEB_API_KEY_HASH
+#exec /usr/local/bin/nothing $MYSQL_HOSTNAME $MYSQL_PORT $MYSQL_USERNAME $MYSQL_PASSWORD $MYSQL_DBNAME $NODE_ID $WEB_API_KEY_NAME $WEB_API_KEY_HASH
 fi
 
 exec /usr/local/bin/nothing
diff --git a/php-zendserver_latest/zend-201904161519.lic b/php-zendserver_latest/zend-201904161519.lic
new file mode 100644
index 0000000..b3cdd1e
--- /dev/null
+++ b/php-zendserver_latest/zend-201904161519.lic
@@ -0,0 +1 @@
+{"ZEND_LICENSE_ORDER":"zs-docker","ZEND_LICENSE_KEY":"EKUE9J41801G21BB2C5E2D1552E2F404"}
diff --git a/php-zendserver_latest/zend.lic b/php-zendserver_latest/zend.lic
deleted file mode 100644
index 59b6ba7..0000000
diff --git a/php-zendserver_latest/zs2018_0-apache2_4.list b/php-zendserver_latest/zs2018_0-apache2_4.list
new file mode 100644
index 0000000..9577f61
--- /dev/null
+++ b/php-zendserver_latest/zs2018_0-apache2_4.list
@@ -0,0 +1 @@
+deb http://repos.zend.com/zend-server/2018.0/deb_apache2.4 server non-free
\ No newline at end of file

yosifkit · 2019-04-24T23:30:27Z

Build test of #5752; e39202b; amd64 (php-zendserver):

$ bashbrew build php-zendserver:5.6
Building bashbrew/cache:7b84a8a35fb3409fd7c011f6d15ec13441517be4bc99a13e67ff8321a92e25a3 (php-zendserver:5.6)
Tagging php-zendserver:5.6
Tagging php-zendserver:8.5-php5.6
Tagging php-zendserver:8.5

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


$ bashbrew build php-zendserver:9.1
Building bashbrew/cache:fd99a87c2864fb8886911ba005f4ca0c6ddc3d09284b4b0676fcb9adf1d215d4 (php-zendserver:9.1)
Tagging php-zendserver:9.1

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


$ bashbrew build php-zendserver:2018.0
Building bashbrew/cache:b43c3c13ea402b0d79d4cab831dbb827076b362986b53083fa45fab2473366d7 (php-zendserver:2018.0)
Tagging php-zendserver:2018.0
Tagging php-zendserver:latest

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

yosifkit · 2019-04-24T23:38:49Z

library/php-zendserver

@@ -1,6 +1,6 @@
-Maintainers: David Lowes <david.l@zend.com> (@davidl-zend)
+Maintainers: Andrus Viik <andrus.viik@roguewave.com> (@andrus7k)


I'll use your commit rights on https://github.com/zendtech/php-zendserver-docker as validation to make the maintainer change. If @davidl-zend wants to revert or change this, then please let us know.

andrus7k added 3 commits March 12, 2019 14:42

releasing zendserver 2018.0.3 9.1.8 8.5.12

e659bfc

Changing php-zendserver maintainer.

aa18816

releasing zendserver 2018.0.3 9.1.8 8.5.12 (w cloud-license)

3309441

docker-library-bot added the library/php-zendserver label Apr 17, 2019

This comment has been minimized.

Sign in to view

ZendServer Dockerfile checksums and cleanup

317f5d1

This comment has been minimized.

Sign in to view

Unified different Dockerfile's, dropped repo-installer usage.

e39202b

yosifkit reviewed Apr 24, 2019

View reviewed changes

yosifkit merged commit f7a7974 into docker-library:master Apr 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

releasing zendserver 2018.0.3 9.1.8 8.5.12 #5752

releasing zendserver 2018.0.3 9.1.8 8.5.12 #5752

andrus7k commented Apr 17, 2019

This comment has been minimized.

yosifkit commented Apr 17, 2019

This comment has been minimized.

tianon commented Apr 22, 2019

yosifkit commented Apr 24, 2019

yosifkit commented Apr 24, 2019

yosifkit Apr 24, 2019

		@@ -1,6 +1,6 @@
		Maintainers: David Lowes <david.l@zend.com> (@davidl-zend)
		Maintainers: Andrus Viik <andrus.viik@roguewave.com> (@andrus7k)

releasing zendserver 2018.0.3 9.1.8 8.5.12 #5752

releasing zendserver 2018.0.3 9.1.8 8.5.12 #5752

Conversation

andrus7k commented Apr 17, 2019

This comment has been minimized.

yosifkit commented Apr 17, 2019

This comment has been minimized.

tianon commented Apr 22, 2019

yosifkit commented Apr 24, 2019

yosifkit commented Apr 24, 2019

yosifkit Apr 24, 2019

Choose a reason for hiding this comment