Build docker image for multiple architectures. Update to newer ODK an…

…d remove redundant tools.

Dockerfile

@@ -1,13 +1,13 @@
-FROM obolibrary/odkfull:v1.2.29
+FROM obolibrary/odkfull:v1.4.1
 
 # Install tools provided by Ubuntu.
-RUN DEBIAN_FRONTEND="noninteractive" apt-get update && apt-get install -y --no-install-recommends \
-    graphviz \
-    nodejs \
-    npm
+#RUN DEBIAN_FRONTEND="noninteractive" apt-get update && apt-get install -y --no-install-recommends \
+#    graphviz \
+#    nodejs \
+#    npm
 
 ###### Souffle ######
-RUN curl -s https://packagecloud.io/install/repositories/souffle-lang/souffle/script.deb.sh | bash && apt-get install -y souffle
+#RUN curl -s https://packagecloud.io/install/repositories/souffle-lang/souffle/script.deb.sh | bash && apt-get install -y souffle
 
 ###### blazegraph-runner #####
 ENV BR=1.7
@@ -17,23 +17,23 @@ RUN wget -nv https://github.com/balhoff/blazegraph-runner/releases/download/v$BR
 && mv blazegraph-runner-$BR /tools/blazegraph-runner
 
 ###### relation-graph #####
-ENV RG=2.2.0
-ENV PATH "/tools/relation-graph/bin:$PATH"
-RUN wget -nv https://github.com/balhoff/relation-graph/releases/download/v$RG/relation-graph-cli-$RG.tgz \
-&& tar -zxvf relation-graph-cli-$RG.tgz \
-&& mv relation-graph-cli-$RG /tools/relation-graph
+#ENV RG=2.3.1
+#ENV PATH "/tools/relation-graph/bin:$PATH"
+#RUN wget -nv https://github.com/balhoff/relation-graph/releases/download/v$RG/relation-graph-cli-$RG.tgz \
+#&& tar -zxvf relation-graph-cli-$RG.tgz \
+#&& mv relation-graph-cli-$RG /tools/relation-graph
 
-###### relation-graph #####
+###### rdf-to-table #####
 ENV RTT=0.1
 ENV PATH "/tools/rdf-to-table/bin:$PATH"
 RUN wget -nv https://github.com/balhoff/rdf-to-table/releases/download/v$RTT/rdf-to-table-$RTT.tgz \
 && tar -zxvf rdf-to-table-$RTT.tgz \
 && mv rdf-to-table-$RTT /tools/rdf-to-table
 
 ###### obographviz #####
-RUN cd /tools \
-&& git clone 'https://github.com/cmungall/obographviz.git' \
-&& cd obographviz \
-&& git checkout b0d8f64517d4ae0085072866aaadb7602f41acf7 \
-&& make install
-ENV PATH "/tools/obographviz/bin:$PATH"
+#RUN cd /tools \
+#&& git clone 'https://github.com/cmungall/obographviz.git' \
+#&& cd obographviz \
+#&& git checkout b0d8f64517d4ae0085072866aaadb7602f41acf7 \
+#&& make install
+#ENV PATH "/tools/obographviz/bin:$PATH"

Makefile

@@ -279,7 +279,7 @@ kgx/edges.tsv: kgx/nodes.tsv
 #### Commands for building the Docker image ####
 ################################################
 
-VERSION = "1.5"
+VERSION = "1.6"
 IM=monarchinitiative/ubergraph
 
 docker-build-no-cache:
@@ -309,3 +309,6 @@ docker-publish-dev-no-build:
 docker-publish: docker-build
 	@docker push $(IM):$(VERSION) \
 	&& docker push $(IM):latest
+
+docker-all:
+	docker buildx build --platform linux/amd64,linux/arm64 --no-cache --push -t $(IM):$(VERSION) .