Merge pull request #41 from shanrahul/php-7.4-ubuntu-20.04

Updated the base image in the Dockerfile

.github/workflows/build-workflow.yml

@@ -47,7 +47,7 @@ jobs:
           php vendor/bin/codecept run unit
 
       - name: Get installed php version
-        run: echo "VERSION_TAG_NAME=dev-php-$(docker exec dev_web_ubuntu-20.04 php -r 'echo PHP_VERSION;')-ubuntu-20.04" >> $GITHUB_ENV
+        run: echo "VERSION_TAG_NAME=dev-php-$(docker exec dev_web php -r 'echo PHP_VERSION;')-ubuntu-20.04" >> $GITHUB_ENV
 
       - name: New image with a version tag & latest tag
         run: |

docker-image/Dockerfile

@@ -1,4 +1,4 @@
-FROM orangehrm/orangehrm-environment-images:test-php-7.4-ubuntu-20.04
+FROM orangehrm/orangehrm-environment-images:test-php-latest-ubuntu-20.04
 
 MAINTAINER orangehrm
 LABEL authors = "OrangeHRM TechOps<[email protected]>"
@@ -11,6 +11,7 @@ RUN apt-get update
 
 RUN apt-get -y install \
     nano \
+    supervisor \
     memcached \
     && apt-get install --only-upgrade bash \
     && apt-get clean \
@@ -23,7 +24,6 @@ RUN echo "zend_extension=xdebug" >> /etc/php/7.4/cli/php.ini
 # RUN echo "instantclient,/opt/oracle/instantclient_11_2" | pecl install oci8
 # RUN echo "extension=oci8.so" >>/etc/php.ini
 
-
 # Add infection
 COPY infection.phar /usr/bin/infection
 RUN  chmod +x /usr/bin/infection
@@ -38,6 +38,6 @@ RUN pear channel-discover pear.phing.info && \
     pear install phing/phing-2.16.0
 
 # Add supervisor conf
-COPY supervisord.conf /etc/supervisord.conf
+#COPY supervisord.conf /etc/supervisord.conf
 
-ENTRYPOINT ["/lib/systemd/systemd"]
+ENTRYPOINT ["/sbin/init"]

tests/unit/WebContainerCest.php

@@ -104,23 +104,23 @@ public function checkSendMailVersion(UnitTester $I){
         $I->seeInShellOutput("Version 8.15.2");
     }
 
-    // public function checkNodemonInstallation(UnitTester $I){
-    //     $I->wantTo("verify nodemon is installed in the container");
-    //     $I->runShellCommand("docker exec dev_web nodemon");
-    //     $I->seeInShellOutput('Usage: nodemon');
-    // }
+    public function checkOslonDBInstallation(UnitTester $I){
+        $I->wantTo("verify Oslon DB is installed in the container");
+        $I->runShellCommand("docker exec dev_web php -i | grep -i timezone");
+        $I->seeInShellOutput('Timezone Database Version => 2024');
+    }
 
     public function checkBowerVersion(UnitTester $I){
         $I->wantTo("verify bower is installed in the container");
         $I->runShellCommand('docker exec dev_web bash -c \'export NVM_DIR="/usr/local/nvm"; [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"; bower -v\' ');
         $I->seeInShellOutput('1');
     }
 
-    // public function checkOci8PHPmodule(UnitTester $I){
-    //     $I->wantTo("verify php module oci8 is installed in the container");
-    //     $I->runShellCommand("docker exec dev_web php -m");
-    //     $I->seeInShellOutput('oci8');
-    // }
+    public function checkwkhtmltopdfVersion(UnitTester $I){
+        $I->wantTo("verify wkhtmltopdf is installed in the container");
+        $I->runShellCommand('docker exec dev_web wkhtmltopdf --version');
+        $I->seeInShellOutput('wkhtmltopdf 0.12');
+    }
 
     // public function checkInfectionFrameworkInstallation(UnitTester $I){
     //     $I->wantTo("verify infection framework is installed in the container");