Skip to content

Commit

Permalink
Merge pull request #210 from FREVA-CLINT/new-root-path
Browse files Browse the repository at this point in the history
New root path
  • Loading branch information
antarcticrainforest authored Sep 5, 2024
2 parents 04807a9 + e79ed39 commit 27183b9
Show file tree
Hide file tree
Showing 10 changed files with 220 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ RUN set -x && \
mv /var/solr ${SOLR_HOME} &&\
ln -s ${SOLR_HOME} /var/solr &&\
chown -R freva:freva ${MYSQL_HOME} &&\
MARIADB_CONF_FILE=/etc/mysql/conf.d/freva.cnf
export MARIADB_CONF_FILE=/etc/mysql/conf.d/freva.cnf &&\
echo "[mariadbd]" > $MARIADB_CONF_FILE &&\
echo "user = freva" >> $MARIADB_CONF_FILE &&\
echo "datadir = ${MYSQL_DATA_DIR}" >> $MARIADB_CONF_FILE &&\
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
-
name: Set up services
run: |
docker-compose up -d --remove-orphans
docker compose up -d --remove-orphans
-
name: Install dependencies on python ${{matrix.python-version}}
run: |
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
-
name: Set up services
run: |
docker-compose up -d --remove-orphans
docker compose up -d --remove-orphans
-
name: Preparing docs
run: |
Expand Down
2 changes: 1 addition & 1 deletion compose/config
2 changes: 1 addition & 1 deletion compose/drs_config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[testdata]
root_dir = ".docker/data"
root_path = ".docker/data"
parts_dir = [
"project", "product", "institute", "model", "experiment", "time_frequency",
"realm", "cmor_table", "ensemble", "version", "variable",
Expand Down
Loading

0 comments on commit 27183b9

Please sign in to comment.