Merge pull request docker-library#3 from polyverse/feature/add-alpine

Feature/add alpine

Author: truestblue

7.2/alpine3.8/fpm/Dockerfile

@@ -1,3 +1,16 @@
+FROM golang
+WORKDIR /go/src/github.com/polyverse/
+COPY . .
+RUN git clone https://github.com/polyverse/php-scrambler.git
+WORKDIR ./php-scrambler
+RUN git checkout 8de1d48c2d410d1f3c4d02b9742dba164486c3fc
+RUN go get -v .
+RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build
+WORKDIR /go/src/github.com/polyverse/
+RUN git clone https://github.com/polyverse/tok-php-transformer.git
+WORKDIR ./tok-php-transformer
+RUN git checkout ff08cca989bd3c876955ce01f9692d7c1239af9d
+
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
 #
@@ -15,15 +28,20 @@ ENV PHPIZE_DEPS \
 		g++ \
 		gcc \
 		libc-dev \
+		vim \
 		make \
 		pkgconf \
 		re2c
 
 # persistent / runtime deps
 RUN apk add --no-cache --virtual .persistent-deps \
+		$PHPIZE_DEPS \
 		ca-certificates \
 		curl \
 		tar \
+                bison \
+                libxml2-dev \
+		bash \
 		xz \
 # https://github.com/docker-library/php/issues/494
 		libressl
@@ -56,12 +74,11 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
 
-ENV PHP_VERSION 7.2.13
+ENV PHP_VERSION 7.2.13-polyscripted
 ENV PHP_URL="https://secure.php.net/get/php-7.2.13.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.2.13.tar.xz.asc/from/this/mirror"
 ENV PHP_SHA256="14b0429abdb46b65c843e5882c9a8c46b31dfbf279c747293b8ab950c2644a4b" PHP_MD5=""
 
 RUN set -xe; \
-	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
 		wget \
@@ -93,6 +110,9 @@ RUN set -xe; \
 	apk del .fetch-deps
 
 COPY docker-php-source /usr/local/bin/
+COPY scripts/ /usr/local/bin/polyscripting
+ENV POLYSCRIPT_PATH "/usr/local/bin/polyscripting"
+ENV PHP_SRC_PATH "/usr/src/php"
 
 RUN set -xe \
 	&& apk add --no-cache --virtual .build-deps \
@@ -105,7 +125,6 @@ RUN set -xe \
 		libsodium-dev \
 		libxml2-dev \
 		sqlite-dev \
-	\
 	&& export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
@@ -138,22 +157,20 @@ RUN set -xe \
 		--with-libedit \
 		--with-openssl \
 		--with-zlib \
+		PHP_EXTRA_VERSION="-polyscripted" \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
 		\
 		$PHP_EXTRA_CONFIGURE_ARGS \
-	&& make -j "$(nproc)" \
-	&& make install \
+	&& /usr/local/bin/polyscripting/polyscript-enable \
 	&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
-	&& make clean \
 	\
 # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
 	&& cp -v php.ini-* "$PHP_INI_DIR/" \
 	\
 	&& cd / \
-	&& docker-php-source delete \
 	\
 	&& runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -163,17 +180,17 @@ RUN set -xe \
 	)" \
 	&& apk add --no-cache --virtual .php-rundeps $runDeps \
 	\
-	&& apk del .build-deps \
-	\
 # https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
 	&& rm -rf /tmp/pear ~/.pearrc
 
+
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
 # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
 RUN docker-php-ext-enable sodium
 
+
 ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
@@ -214,6 +231,11 @@ RUN set -ex \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/zz-docker.conf
 
+WORKDIR /usr/local/bin/polyscripting
+COPY --from=0 /go/src/github.com/polyverse/php-scrambler/php-scrambler /usr/local/bin/polyscripting
+COPY --from=0 /go/src/github.com/polyverse/tok-php-transformer/tok-php-transformer.php /usr/local/bin/polyscripting
+COPY --from=0 /go/src/github.com/polyverse/tok-php-transformer/snip-transform.php /usr/local/bin/polyscripting
+
 EXPOSE 9000
 CMD ["php-fpm"]
 ##</autogenerated>##

7.2/alpine3.8/fpm/publish-image.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+image="polyverse/ps-php7.2-fpm"
+
+echo "$(date) Obtaining current git sha for tagging the docker image"
+headsha=$(git rev-parse --verify HEAD)
+
+
+docker build -t $image:alpine-$headsha .
+docker push $image:alpine-$headsha
+
+echo "Pushing as latest tag..."
+docker tag $image:alpine-$headsha $image:latest
+docker push $image:latest
+

7.2/alpine3.8/fpm/scripts/build-scrambled.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ ! -f "$PATH/s_php" ]; then
+     cp /usr/local/bin/php /usr/local/bin/s_php
+fi  
+
+./php-scrambler
+
+cd $POLYSCRIPT_PATH
+s_php tok-php-transformer.php -p "$PHP_SRC_PATH"/ext/phar --replace --inc
+
+cd $PHP_SRC_PATH
+make install -k
+
+cd $POLYSCRIPT_PATH
+s_php tok-php-transformer.php -p "$PHP_SRC_PATH"/ext/phar/phar.php --replace
+
+cd $PHP_SRC_PATH
+make install -k
+

7.2/alpine3.8/fpm/scripts/polyscript-enable

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+sed -i '/^PHP_EXTRA_VERSION/s/"$/-poly"/' configure
+sed -i '/^PHP_EXTRA_VERSION/s/"$/-poly"/' configure.ac
+sed -i '/^PHP_EXTRA_VERSION/s"$/-poly"/' Makefile
+sed -i '/PHP_EXTRA_VERSION/s/""/"-poly"/' main/php_version.h
+sed -i '/PHP_VERSION "/s/"$/-poly"/' main/php_version.h
+
+make -j "$(nproc)"
+make install
+make clean
+
+cp "$POLYSCRIPT_PATH"/src/pharcommand.inc "$PHP_SRC_PATH"/ext/phar/phar/
+rm "$POLYSCRIPT_PATH"/polyscript-enable
+