fix(dockerimage): php7.4 image should php 7.4

tine20 · Sep 8, 2021 · e40c062 · e40c062
1 parent 0858f79
commit e40c062
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/ci/ci-config.yml b/ci/ci-config.yml
@@ -127,7 +127,7 @@ variables:
 
   CHECK_PHP_VERSION:
     description: "Test if the image was build with the correct php version."
-    value: "false"
+    value: "true"
 
   PHP_VERSION:
     description: "Php version to use."
@@ -155,4 +155,4 @@ variables:
 
   COMPOSER_LOCK_REWRITE:
     description: "Rewrite composer lock to pull packages from cache."
-    value: "true"
+    value: "true"
diff --git a/ci/dockerimage/base.Dockerfile b/ci/dockerimage/base.Dockerfile
@@ -48,7 +48,7 @@ RUN apk add --no-cache --simulate --repository http://nl.alpinelinux.org/alpine/
                                   ${ALPINE_PHP_PACKAGE}-json \
                                   ${ALPINE_PHP_PACKAGE}-phar \
                                   | sha256sum >> /cachehash
-RUN if [ ${ALPINE_PHP_PACKAGE} == php7 ]; then \
+RUN if [ ${ALPINE_PHP_PACKAGE} == php7 ] && [ ${ALPINE_PHP_REPOSITORY_BRANCH} == v3.12 ]; then \
         apk add --no-cache --simulate --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/community \
                                   php7-pecl-redis=4.3.0-r2 | sha256sum >> /cachehash; \
     else \
@@ -108,7 +108,7 @@ RUN apk add --no-cache --repository http://nl.alpinelinux.org/alpine/${ALPINE_PH
                                   ${ALPINE_PHP_PACKAGE}-posix \
                                   ${ALPINE_PHP_PACKAGE}-json \
                                   ${ALPINE_PHP_PACKAGE}-phar
-RUN if [ ${ALPINE_PHP_PACKAGE} == php7 ]; then \
+RUN if [ ${ALPINE_PHP_PACKAGE} == php7 ] && [ ${ALPINE_PHP_REPOSITORY_BRANCH} == v3.12 ]; then \
         apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/community php7-pecl-redis=4.3.0-r2; \
     else \
         apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/${ALPINE_PHP_REPOSITORY_BRANCH}/${ALPINE_PHP_REPOSITORY_REPOSITORY} \

diff --git a/ci/dockerimage/make.sh b/ci/dockerimage/make.sh
@@ -192,12 +192,12 @@ function make_image() {
     case "${php_version}" in
         7.3)
             alpine_php_repository_branch=v3.12
-            alpine_php_repository_repository=main
+            alpine_php_repository_repository=community
             alpine_php_package=php7
             ;;
         7.4)
-            alpine_php_repository_branch=edge
-            alpine_php_repository_repository=main
+            alpine_php_repository_branch=v3.14
+            alpine_php_repository_repository=community
             alpine_php_package=php7
             ;;
         8.0)

diff --git a/ci/gitlab-ci/test_jobs.yml b/ci/gitlab-ci/test_jobs.yml
@@ -1,13 +1,14 @@
 "check php version":
+  extends: .abstract_jobs.copy_source
   stage: test
   variables:
     ARG_IMAGE: test-source
   needs:
     - docker_build_source
   script:
     - echo "PHP version shoud be ${PHP_VERSION}."
-    - echo "PHP version is $(php -r 'echo PHP_VERSION;')"
-    - "[[ $(php -r 'echo PHP_VERSION;') == $PHP_VERSION.* ]]"
+    - php -r "echo 'PHP version is'.PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;"
+    - php -r "if (version_compare(PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION, '${PHP_VERSION}', '!=')) exit(1);"
   rules:
     - if: $RUN_NO_TESTS == "true"
       when: never