Towards a working docker version...

4 files changed, 9 insertions, 17 deletions

diff --git a/Dockerfile b/Dockerfile
index 49c40aa..fa842b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,16 @@
-FROM camilstaps/clean:itasks-latest
+FROM camilstaps/clean:nightly
 
-COPY make_abc.sh .
-RUN ./make_abc.sh
-
-RUN touch /home/.iclean_history /home/.iclean_template
+RUN install_clean.sh bundle-complete 2017-10-09
 
 COPY . /usr/src/iclean
 WORKDIR /usr/src/iclean
-RUN PACKAGES="libreadline-dev make gcc" \
+
+RUN ./make_abc.sh \
+	&& touch /home/.iclean_history /home/.iclean_template\
+	&& PACKAGES="libreadline6 libreadline6-dev make gcc" \
 	&& apt-get update -qq \
 	&& apt-get install -qq $PACKAGES --no-install-recommends \
-	&& ln -s /opt/clean/lib/clean-platform/OS-Independent /opt/clean/lib/Platform \
 	&& make -B \
-# Cleanup
 	&& rm -rf \
 		Clean\ System\ Files \
 		CleanReadLine \
@@ -20,12 +18,7 @@ RUN PACKAGES="libreadline-dev make gcc" \
 		Dockerfile \
 		*.h *.c *.o \
 		*.dcl *.icl \
-		make_abc.sh \
-	&& apt-get remove --purge -qq $PACKAGES \
-	&& apt-get autoremove --purge -qq \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update -qq && apt-get install -qq gcc
+		make_abc.sh
 
 ENTRYPOINT "./iclean"
 CMD []
diff --git a/Makefile b/Makefile
index d7b5684..093eeb0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ CLMFLAGS=\
 	-I CleanReadLine\
 	-l -lreadline\
 	-l compile.o\
-	-l -no-pie -no-opt-link\
 	-nr -nt
 
 all: iclean
diff --git a/iclean.icl b/iclean.icl
index c29dda3..520e91d 100644
--- a/iclean.icl
+++ b/iclean.icl
@@ -38,7 +38,7 @@ import ExtraString
 temp_path :== "/tmp/"
 temp_module :== "iclean"
 readline_history :== "/home/.iclean_history"
-template :== map ((+++) "import ") ["StdEnv", "StdDynamic", "genLibTest"]
+template :== map ((+++) "import ") ["StdEnv", "StdDynamic", "Gast.GenLibTest"]
 template_file :== "/home/.iclean_template"
 // END SETTINGS
 
diff --git a/make_abc.sh b/make_abc.sh
index 3d386d7..e82de6e 100755
--- a/make_abc.sh
+++ b/make_abc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-libs="ArgEnv Directory Dynamics Gast Generics MersenneTwister StdEnv StdLib TCPIP clean-platform/OS-Independent clean-platform/OS-Posix clean-platform/OS-Linux clean-platform/OS-Linux-64 clean-platform/OS-Independent/Deprecated/StdLib"
+libs="ArgEnv Directory Dynamics Gast Generics MersenneTwister StdEnv TCPIP Platform Platform/Deprecated/StdLib"
 shopt -s globstar
 for lib in $libs
 do