Change of docker image references in demo project from `utplsqlv3/ora…

…cledb:19c-se2-small` to `gvenzl/oracle-xe:21-faststart` Resolves: #16
utPLSQL · Jul 9, 2023 · eff5315 · eff5315
1 parent 69d0071
commit eff5315
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/.azure_templates/vars/vars-global.yml b/.azure_templates/vars/vars-global.yml
@@ -1,6 +1,6 @@
 variables:
   containerRegistry: "utPLSQL-docker"
-  dockerRepo: "utplsqlv3/oracledb"
+  dockerRepo: "gvenzl/oracle-xe"
   gitRepo: "https://github.com/utPLSQL/utPLSQL.git"
   sqlclUrl: "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip"
   utplsqlcliUrl: "https://github.com/utPLSQL/utPLSQL-cli/releases/download/$(UTPLSQL_CLI_VERSION)/utPLSQL-cli.zip"

diff --git a/utlplsql-demo-project.yml b/utlplsql-demo-project.yml
@@ -11,7 +11,7 @@ variables:
   UTPLSQL_CLI_DIR: $(Build.BinariesDirectory)/utPLSQL-cli
   UTPLSQL_CLI_VERSION: 'v3.1.8'
   UTPLSQL_VERSION: 'v3.1.11' 
-  DOCKHER_HUB_REPO: 'utplsqlv3/oracledb'
+  DOCKHER_HUB_REPO: 'gvenzl/oracle-xe'
   DB_USER: ut3_demo
   DB_PASS: ut3_demo  
 
@@ -45,16 +45,16 @@ jobs:
   - template: .azure_templates/t-extend-database-build.yml
     parameters:
       containerRegistry: utPLSQL-docker
-      dockerRepo: utplsqlv3/oracledb    
+      dockerRepo: gvenzl/oracle-xe
       utplsqlVersion: ${UTPLSQL_VERSION}
       utplsqlDir: ${UTPLSQL_DIR}
       test_user: ${DB_USER}
       test_pwd: ${DB_PASS}
       targetDatabases:
-        - oracleVersion: "19c-se2-small"
-          connectionString: "127.0.0.1:1521/ORCLCDB"
+        - oracleVersion: "21-faststart"
+          connectionString: "127.0.0.1:1521/XE"
           dockerPortMap: "1521"
-          dockerOptions: "--shm-size=1g"
+          dockerOptions: "21-faststart"
           scripts:
             - displayName: "Install utPLSQL"
               user: "sys"

diff --git a/utplsql-cicd-flyway-demo.yml b/utplsql-cicd-flyway-demo.yml
@@ -35,8 +35,8 @@ extends:
       - name: BuildDatabase
         containerRegistry: ${{ variables.containerRegistry }}
         dockerRepo: ${{ variables.dockerRepo }}
-        connectionString: "127.0.0.1:1521/ORCLCDB"
-        jdbcConnectionString: "UTBUILD:1521:ORCLCDB"
+        connectionString: "127.0.0.1:1521/XE"
+        jdbcConnectionString: "UTBUILD:1521:XE"
         environment: "build"
         artifactName: ${{ variables.artifactName }}
         packages:
@@ -57,9 +57,9 @@ extends:
             url: ${{ variables.ojdbcurl }}        
         createDatabase:
           - dbname: UTBUILD
-            oracleVersion: "19c-se2-small"
+            oracleVersion: "21-faststart"
             dockerPortMap: "1521"
-            dockerOptions: "--shm-size=1g"
+            dockerOptions: ""
         scripts:
           - displayName: "Install utPLSQL"
             user: "sys"
@@ -100,15 +100,15 @@ extends:
         display_name: Deploy code to Test Env
         dependsOn: BuildDatabase
         target_environment: TEST
-        connectionString: "127.0.0.1:1521/ORCLCDB"
-        jdbcConnectionString: "UTTEST:1521:ORCLCDB"
+        connectionString: "127.0.0.1:1521/XE"
+        jdbcConnectionString: "UTTEST:1521:XE"
         containerRegistry: ${{ variables.containerRegistry }}
         dockerRepo: ${{ variables.dockerRepo }}     
         createDatabase:
           - dbname: UTTEST
-            oracleVersion: "19c-se2-small"
+            oracleVersion: "21-faststart"
             dockerPortMap: "1521"
-            dockerOptions: "--shm-size=1g"        
+            dockerOptions: ""
         packages:
           - name: sqlcl
             download_location: "$(Build.BinariesDirectory)/sqlcl-latest.zip"

diff --git a/utplsql-cicd-liquibase-demo.yml b/utplsql-cicd-liquibase-demo.yml
@@ -34,7 +34,7 @@ extends:
       - name: BuildDatabase
         containerRegistry: ${{ variables.containerRegistry }}
         dockerRepo: ${{ variables.dockerRepo }}
-        connectionString: "127.0.0.1:1521/ORCLCDB"
+        connectionString: "127.0.0.1:1521/XE"
         environment: "build"
         artifactName: ${{ variables.artifactName }}
         releaseMethod: "liquibase"
@@ -53,9 +53,9 @@ extends:
             addToPath: "$(UTPLSQL_CLI_DIR)/bin"
         createDatabase:
           - dbname: UTBUILD
-            oracleVersion: "19c-se2-small"
+            oracleVersion: "21-faststart"
             dockerPortMap: "1521"
-            dockerOptions: "--shm-size=1g"
+            dockerOptions: ""
         scripts:
           - displayName: "Install utPLSQL"
             user: "sys"
@@ -94,14 +94,14 @@ extends:
         display_name: Deploy code to Test Env
         dependsOn: BuildDatabase
         target_environment: TEST
-        connectionString: "127.0.0.1:1521/ORCLCDB"
+        connectionString: "127.0.0.1:1521/XE"
         containerRegistry: ${{ variables.containerRegistry }}
         dockerRepo: ${{ variables.dockerRepo }}     
         createDatabase:
           - dbname: UTTEST
-            oracleVersion: "19c-se2-small"
+            oracleVersion: "21-faststart"
             dockerPortMap: "1521"
-            dockerOptions: "--shm-size=1g"        
+            dockerOptions: ""
         packages:
           - name: sqlcl
             download_location: "$(Build.BinariesDirectory)/sqlcl-latest.zip"