Merge pull request #6755 from paulbalandan/oracle-image

Streamline Oracle docker image
codeigniter4 · Oct 26, 2022 · 9f77ee2 · 9f77ee2
2 parents e358932 + cf2ce4c
commit 9f77ee2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
@@ -33,6 +33,10 @@ concurrency:
 
 env:
  COVERAGE_PHP_VERSION: '8.1'
+ NLS_LANG: 'AMERICAN_AMERICA.UTF8'
+ NLS_DATE_FORMAT: 'YYYY-MM-DD HH24:MI:SS'
+ NLS_TIMESTAMP_FORMAT: 'YYYY-MM-DD HH24:MI:SS'
+ NLS_TIMESTAMP_TZ_FORMAT: 'YYYY-MM-DD HH24:MI:SS'
 
 jobs:
  tests:
@@ -82,12 +86,18 @@ jobs:
  options: --health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'" --health-interval=10s --health-timeout=5s --health-retries=3
 
  oracle:
- image: quillbuilduser/oracle-18-xe
+ image: gvenzl/oracle-xe:21
  env:
- ORACLE_ALLOW_REMOTE: true
+ ORACLE_RANDOM_PASSWORD: true
+ APP_USER: ORACLE
+ APP_USER_PASSWORD: ORACLE
  ports:
  - 1521:1521
- options: --health-cmd="/opt/oracle/product/18c/dbhomeXE/bin/sqlplus -s sys/Oracle18@oracledbxe/XE as sysdba <<< 'SELECT 1 FROM DUAL'" --health-interval=10s --health-timeout=5s --health-retries=3
+ options: >-
+ --health-cmd healthcheck.sh
+ --health-interval 20s
+ --health-timeout 10s
+ --health-retries 10
 
  redis:
  image: redis
@@ -105,28 +115,6 @@ jobs:
  if: matrix.db-platforms == 'SQLSRV'
  run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
 
- - name: Install Oracle InstantClient
- if: matrix.db-platforms == 'OCI8'
- run: |
- sudo apt-get install wget libaio1 alien
- sudo wget https://download.oracle.com/otn_software/linux/instantclient/185000/oracle-instantclient18.5-basic-18.5.0.0.0-3.x86_64.rpm
- sudo wget https://download.oracle.com/otn_software/linux/instantclient/185000/oracle-instantclient18.5-devel-18.5.0.0.0-3.x86_64.rpm
- sudo wget https://download.oracle.com/otn_software/linux/instantclient/185000/oracle-instantclient18.5-sqlplus-18.5.0.0.0-3.x86_64.rpm
- sudo alien oracle-instantclient18.5-basic-18.5.0.0.0-3.x86_64.rpm
- sudo alien oracle-instantclient18.5-devel-18.5.0.0.0-3.x86_64.rpm
- sudo alien oracle-instantclient18.5-sqlplus-18.5.0.0.0-3.x86_64.rpm
- sudo dpkg -i oracle-instantclient18.5-basic_18.5.0.0.0-4_amd64.deb oracle-instantclient18.5-devel_18.5.0.0.0-4_amd64.deb oracle-instantclient18.5-sqlplus_18.5.0.0.0-4_amd64.deb
- echo "LD_LIBRARY_PATH=/lib/oracle/18.5/client64/lib/" >> $GITHUB_ENV
- echo "NLS_LANG=AMERICAN_AMERICA.UTF8" >> $GITHUB_ENV
- echo "C_INCLUDE_PATH=/usr/include/oracle/18.5/client64" >> $GITHUB_ENV
- echo 'NLS_DATE_FORMAT=YYYY-MM-DD HH24:MI:SS' >> $GITHUB_ENV
- echo 'NLS_TIMESTAMP_FORMAT=YYYY-MM-DD HH24:MI:SS' >> $GITHUB_ENV
- echo 'NLS_TIMESTAMP_TZ_FORMAT=YYYY-MM-DD HH24:MI:SS' >> $GITHUB_ENV
-
- - name: Create database for Oracle Database
- if: matrix.db-platforms == 'OCI8'
- run: echo -e "ALTER SESSION SET CONTAINER = XEPDB1;\nCREATE BIGFILE TABLESPACE \"TEST\" DATAFILE '/opt/oracle/product/18c/dbhomeXE/dbs/TEST' SIZE 10M AUTOEXTEND ON MAXSIZE UNLIMITED SEGMENT SPACE MANAGEMENT AUTO EXTENT MANAGEMENT LOCAL AUTOALLOCATE;\nCREATE USER \"ORACLE\" IDENTIFIED BY \"ORACLE\" DEFAULT TABLESPACE \"TEST\" TEMPORARY TABLESPACE TEMP QUOTA UNLIMITED ON \"TEST\";\nGRANT CONNECT,RESOURCE TO \"ORACLE\";\nexit;" | /lib/oracle/18.5/client64/bin/sqlplus -s sys/Oracle18@localhost:1521/XE as sysdba
-
  - name: Checkout
  uses: actions/checkout@v3
 

diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -167,7 +167,7 @@ public function run()
  }
 
  if ($this->db->DBDriver === 'OCI8') {
- $this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY/MM/DD HH24:MI:SS']);
+ $this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY-MM-DD HH24:MI:SS']);
  $data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
  $data['type_test'][0]['type_date'] = '2020-01-11 22:11:00';
  $data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';