Merge pull request #173 from WyriHaximusNet/support-upper-case-alpha,-beta,-and-rc-suffixes

Support upper case alpha, beta, and rc suffixes

Author: WyriHaximus

Dockerfile-nts-debian

@@ -94,7 +94,7 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/debian/dev-mode /usr/local/bin/dev-mode
 COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
-RUN if [ $(php -v | grep "alpha\|beta\|rc" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
+RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
     && yes | apt-get install make
@@ -113,7 +113,7 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/debian/dev-mode /usr/local/bin/dev-mode
 COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
-RUN if [ $(php -v | grep "alpha\|beta\|rc" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
+RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
     && yes | apt-get install make

Dockerfile-zts-debian

@@ -96,7 +96,7 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/debian/dev-mode /usr/local/bin/dev-mode
 COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
-RUN if [ $(php -v | grep "alpha\|beta\|rc" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
+RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
     && yes | apt-get install make
@@ -115,7 +115,7 @@ RUN touch /.you-are-in-a-wyrihaximus.net-php-docker-image-dev
 # Install docker help scripts
 COPY src/php/utils/docker/debian/dev-mode /usr/local/bin/dev-mode
 COPY src/php/utils/docker/debian/docker-php-dev-mode /usr/local/bin/docker-php-dev-mode
-RUN if [ $(php -v | grep "alpha\|beta\|rc" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
+RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; then true ; else dev-mode; fi \
     && rm -rf /usr/local/bin/dev-mode \
     && rm -rf /usr/local/bin/docker-php-dev-mode \
     && yes | apt-get install make

test-nts.sh

@@ -15,7 +15,7 @@ declare TEST_SUITE
 
 TEST_SUITE="php_$IMAGE_ARCH"
 
-if [[ $DOCKER_TAG == *"-dev"* && $IMAGE_BASE_VERSION != *"alpha"* && $IMAGE_BASE_VERSION != *"beta"* && $IMAGE_BASE_VERSION != *"rc"* ]]; then
+if [[ $DOCKER_TAG == *"-dev"* && $IMAGE_BASE_VERSION != *"alpha"* && $IMAGE_BASE_VERSION != *"beta"* && $IMAGE_BASE_VERSION != *"rc"*  && $IMAGE_BASE_VERSION != *"ALPHA"* && $IMAGE_BASE_VERSION != *"BETA"* && $IMAGE_BASE_VERSION != *"RC"* ]]; then
     TEST_SUITE="php_nts or php_dev"
 else
     TEST_SUITE="php_nts or php_no_dev and not php_dev"

test-zts.sh

@@ -15,7 +15,7 @@ declare TEST_SUITE
 
 TEST_SUITE="php_$IMAGE_ARCH"
 
-if [[ $DOCKER_TAG == *"-dev"* && $IMAGE_BASE_VERSION != *"alpha"* && $IMAGE_BASE_VERSION != *"beta"* && $IMAGE_BASE_VERSION != *"rc"* ]]; then
+if [[ $DOCKER_TAG == *"-dev"* && $IMAGE_BASE_VERSION != *"alpha"* && $IMAGE_BASE_VERSION != *"beta"* && $IMAGE_BASE_VERSION != *"rc"*  && $IMAGE_BASE_VERSION != *"ALPHA"* && $IMAGE_BASE_VERSION != *"BETA"* && $IMAGE_BASE_VERSION != *"RC"* ]]; then
     TEST_SUITE="php_zts or php_dev"
 else
     TEST_SUITE="php_zts or php_no_dev and not php_dev"