diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e76f663..6a57798 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: # Set up mash wget https://github.com/marbl/Mash/releases/download/v2.0/mash-Linux64-v2.0.tar tar -xf mash-Linux64-v2.0.tar - cd mash_Linux64-v2.0 + cd mash-Linux64-v2.0 MP = `pwd` echo "MASH_PATH=$MP" >> "$GITHUB_ENV" cd .. diff --git a/Dockerfile b/Dockerfile index dd2e334..260af7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ -FROM kbase/kb_jre:latest as build -RUN apt-get -y update && apt-get -y install ant git openjdk-8-jdk +FROM kbase/sdkbase2 as build RUN cd / && git clone https://github.com/kbase/jars ADD . /src RUN cd /src && ant build RUN find /src + + FROM kbase/kb_jre:latest # These ARGs values are passed in via the docker build command