amalgame/commit

simplify things by reusing stuff from cliopatria image

authorJacco van Ossenbruggen
Sat Sep 9 11:51:47 2017 +0200
committerJacco van Ossenbruggen
Sat Sep 9 11:51:47 2017 +0200
commitb1fa82c0a8b4fc2f53cff144a71587a544fb068a
tree04b8e3e6ec328af9da9109dae1fddde9407317db
parent2f4acf5f9e427daecbaec519395e231a5d3caae5
Diff style: patch stat
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4fc5523..1231c78 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,13 +2,8 @@ FROM jrvosse/cliopatria
 
 RUN apt-get update
 
-ENV CLIOPATRIA_DIR /opt/ClioPatria
-ENV PROJECT_DIR /opt/project
-
 WORKDIR $CLIOPATRIA_DIR
-RUN /opt/ClioPatria/configure --with-localhost
+RUN ./configure --with-localhost
 RUN ./run.pl cpack install amalgame
 
 WORKDIR $PROJECT_DIR
-
-CMD /opt/ClioPatria/configure --with-localhost
diff --git a/docker/config.sh b/docker/config.sh
deleted file mode 100755
index 7f5f72f..0000000
--- a/docker/config.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-VERSION=latest
-APP=amalgame
-REPO=jrvosse
-sudo docker run \
-	-v $PWD:/opt/project \
-	-v /etc/group:/etc/group:ro \
-	-v /etc/passwd:/etc/passwd:ro \
-	-u $( id -u $USER ):$( id -g $USER ) \
-	$REPO/$APP:$VERSION 
diff --git a/docker/run.sh b/docker/run.sh
index 5b6f6e4..558cc23 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -4,11 +4,10 @@ APP=amalgame
 REPO=jrvosse
 HPORT=3020 # Port on host computer
 CPORT=3020 # Port on docker container running ClioPatria
-RUN=${1-./run.pl}
 sudo docker run \
 	-v $PWD:/opt/project \
 	-v /etc/group:/etc/group:ro \
 	-v /etc/passwd:/etc/passwd:ro \
 	-u $( id -u $USER ):$( id -g $USER ) \
 	-p $HPORT:$CPORT -it  \
-	$REPO/$APP:$VERSION $RUN
+	$REPO/$APP:$VERSION $@