Fix docker build

MAIF · Jan 15, 2018 · 8f7aea7 · 8f7aea7
1 parent e408aa5
commit 8f7aea7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/docker/otoroshicli/Dockerfile b/docker/otoroshicli/Dockerfile
@@ -8,8 +8,7 @@ WORKDIR /usr/app
 
 COPY . /usr/app
 
-RUN wget https://dl.bintray.com/maif/binaries/linux-otoroshicli/latest/otoroshicli \
-  && chmod +x otoroshicli 
+RUN chmod +x otoroshicli 
 
 VOLUME /usr/app
 

diff --git a/scripts/dockerpush.sh b/scripts/dockerpush.sh
@@ -11,12 +11,16 @@ then
     docker login -u $DOCKER_USER -p $DOCKER_PASSWORD maif-docker-docker.bintray.io
 
     cd $LOCATION/docker/build
+    cp ../../otoroshi/target/universal/otoroshi-$VERSION.zip ./otoroshi-dist.zip
     docker build --no-cache -t otoroshi .
+    rm ./otoroshi-dist.zip
     docker tag otoroshi maif-docker-docker.bintray.io/otoroshi
     docker push maif-docker-docker.bintray.io/otoroshi
 
     cd $LOCATION/docker/otoroshicli
+    cp ../../clients/cli/target/release/otoroshicli ./otoroshicli
     docker build --no-cache -t otoroshicli .
+    rm ./otoroshicli
     docker tag otoroshicli maif-docker-docker.bintray.io/otoroshicli
     docker push maif-docker-docker.bintray.io/otoroshicli
   fi

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -89,6 +89,15 @@ rm ./otoroshi-dist.zip
 # push docker image on bintray
 docker tag otoroshi "maif-docker-docker.bintray.io/otoroshi:$VERSION"
 docker push "maif-docker-docker.bintray.io/otoroshi:$VERSION"
+
+cd $LOCATION/docker/otoroshicli
+cp ../../clients/cli/target/release/otoroshicli ./otoroshicli
+# build docker image
+docker build --no-cache -t otoroshicli .
+rm ./otoroshicli
+# push docker image on bintray
+docker tag otoroshicli "maif-docker-docker.bintray.io/otoroshicli:$VERSION"
+docker push "maif-docker-docker.bintray.io/otoroshicli:$VERSION"
 cd $LOCATION
 
 # update version number and commit / push