Fix: #31. Use official virtuoso image.

README.md

@@ -7,13 +7,13 @@ and to test different approaches to extract skills from text.
 
 ## Installation
 
-To install the package, you can use pip:
+To install the development version of the package, you can use pip:
 
 ```bash
 pip install git+https://github.com/par-tec/esco-playground
 ```
 
-Optional dependencies are:
+Optional dependencies can be installed via:
 
 ```bash
 pip install esco[langchain]
@@ -128,11 +128,18 @@ and unzip the `.ttl` file under the [`vocabularies`](vocabularies/) folder.
    ```
 
 1. run the tests
+   using tox
 
    ```bash
    tox -e py3
    ```
 
+   or using the docker-compose file
+
+   ```bash
+   docker compose up test
+   ```
+
 ## Regenerate the model
 
 To regenerate the model, you need to setup the ESCO dataset as explained above

docker-compose.yaml

@@ -3,7 +3,6 @@
 #
 # $ docker-compose up -d virtuoso
 #
-version: "3.9"
 services:
   dev: &base
     build: .
@@ -35,13 +34,15 @@ services:
       - "8890:80/tcp"
   virtuoso:
     # user: "1000:1000"
-    image: tenforce/virtuoso
+    # user: root
+    image: docker.io/openlink/virtuoso-opensource-7:7.2.12-alpine
     ports:
     - "18890:8890/tcp"
+    environment:
+      - VIRTUOSO_INI_FILE=/virtuoso.ini
+      - DBA_PASSWORD=
     volumes:
     - .:/code
-    - ./vocabularies:/usr/local/virtuoso-opensource/share/virtuoso/vad/vocabularies
-    - ./ontologies:/usr/local/virtuoso-opensource/share/virtuoso/vad/ontologies
-    - ./schemas:/usr/local/virtuoso-opensource/share/virtuoso/vad/schemas
-    - ./sparql/virtuoso.sh:/virtuoso.sh
-    - ./sparql/virtuoso.ini:/conf/virtuoso.ini
+    - ./data:/database
+    - ./vocabularies:/initdb.d/
+    - ./sparql/virtuoso.ini:/virtuoso.ini

sparql/virtuoso.ini

@@ -22,11 +22,6 @@
 ;  Database setup
 ;
 [Database]
-DatabaseFile      = /usr/local/virtuoso-opensource/var/lib/virtuoso/db/virtuoso.db
-ErrorLogFile      = /usr/local/virtuoso-opensource/var/lib/virtuoso/db/virtuoso.log
-LockFile      = /usr/local/virtuoso-opensource/var/lib/virtuoso/db/virtuoso.lck
-TransactionFile     = /usr/local/virtuoso-opensource/var/lib/virtuoso/db/virtuoso.trx
-xa_persistent_file    = /usr/local/virtuoso-opensource/var/lib/virtuoso/db/virtuoso.pxa
 ErrorLogLevel     = 7
 FileExtend      = 200
 MaxCheckpointRemap    = 2000
@@ -35,8 +30,6 @@ TempStorage     = TempDatabase
 
 
 [TempDatabase]
-DatabaseFile      = /usr/local/virtuoso-opensource/var/lib/virtuoso/db/virtuoso-temp.db
-TransactionFile     = /usr/local/virtuoso-opensource/var/lib/virtuoso/db/virtuoso-temp.trx
 MaxCheckpointRemap    = 2000
 Striping      = 0
 
@@ -63,13 +56,12 @@ MaxStaticCursorRows   = 5000
 CheckpointAuditTrail    = 0
 AllowOSCalls      = 0
 SchedulerInterval   = 10
-DirsAllowed    = ., /data1, /data/dumps/ontologies, /usr/local/virtuoso-opensource/share/virtuoso/vad
+DirsAllowed    = .,/initdb.d
 ThreadCleanupInterval   = 10
 ThreadThreshold     = 10
 ResourcesCleanupInterval  = 10
 FreeTextBatchSize   = 100000
 SingleCPU     = 0
-VADInstallDir     = /usr/local/virtuoso-opensource/share/virtuoso/vad/
 PrefixResultNames               = 0
 RdfFreeTextRulesSize    = 100
 IndexTreeMaps     = 256
@@ -119,7 +111,6 @@ MaxDirtyBuffers          = 6000
 
 [HTTPServer]
 ServerPort      = 8890
-ServerRoot      = /usr/local/virtuoso-opensource/var/lib/virtuoso/vsp
 MaxClientConnections    = 10
 DavRoot       = DAV
 EnabledDavVSP     = 0
@@ -244,8 +235,7 @@ DeferInferenceRulesInit     = 0  ; controls inference rules loading
 ;PingService          = http://rpc.pingthesemanticweb.com/
 
 
-[Plugins]
-LoadPath      = /usr/local/virtuoso-opensource/lib/virtuoso/hosting
+#[Plugins]
 ;Load1        = plain, wikiv
 ;Load2        = plain, mediawiki
 ;Load3        = plain, creolewiki

vocabularies/load.sql

@@ -0,0 +1,4 @@
+ld_dir_all('/initdb.d', '*.ttl', 'http://data.europa.eu/esco');
+rdf_loader_run();
+exec('checkpoint');
+-- WAIT_FOR_CHILDREN;