Merge pull request #372 from PNNL-CompBio/schema_check_update

This resolves an inconsistency for validating new and old datasets

Author: sgosline

build/docker/Dockerfile.upload

@@ -11,15 +11,18 @@ RUN apt-get update && \
     apt-get install -y git curl gnupg && \
     rm -rf /var/lib/apt/lists/*
 
-# Install GitHub CLI (gh)
-RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | \
-    gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && \
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | \
-    tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
-    apt-get update && \
-    apt-get install -y gh && \
-    rm -rf /var/lib/apt/lists/*
+# # Install GitHub CLI (gh)
+# RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | \
+#     gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && \
+#     echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | \
+#     tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
+#     apt-get update && \
+#     apt-get install -y gh && \
+#     rm -rf /var/lib/apt/lists/*
+
 
+# RUN git clone https://github.com/PNNL-CompBio/coderdata.git
+# WORKDIR /usr/src/app/coderdata
 
-RUN git clone https://github.com/PNNL-CompBio/coderdata.git
-WORKDIR /usr/src/app/coderdata
+ADD schema schema
+ADD scripts scripts

schema/coderdata.yaml

@@ -188,7 +188,7 @@ classes:
       - source
       - study
     attributes:
-      drug_drug_2:
+      improve_drug_1:
         description: improve_drug_id of first drug
       improve_drug_2:
         description: imrrove_drug_id of second drug