Clean up build scripts

Author: philipp94831

Diff for: Dockerfile

@@ -4,8 +4,7 @@ RUN yum install -q -y wget readline-devel \
     xorg-x11-server-devel libX11-devel libXt-devel \
     curl-devel \
     gcc-c++ gcc-gfortran \
-    zlib-devel bzip2 bzip2-libs \
-    openssl-devel libxml2-devel
+    zlib-devel bzip2 bzip2-libs
 
 ARG VERSION=3.6.0
 ARG R_DIR=/opt/R/
@@ -22,7 +21,8 @@ RUN ./configure --prefix=${R_DIR} --exec-prefix=${R_DIR} --with-libpth-prefix=/o
     cp /usr/lib64/libgfortran.so.3 lib/ && \
     cp /usr/lib64/libgomp.so.1 lib/ && \
     cp /usr/lib64/libquadmath.so.0 lib/ && \
-    cp /usr/lib64/libstdc++.so.6 lib/ && \
+    cp /usr/lib64/libstdc++.so.6 lib/
+RUN yum install -q -y openssl-devel libxml2-devel && \
     ./bin/Rscript -e 'install.packages(c("httr", "aws.s3", "logging"), repos="http://cran.r-project.org")'
 CMD mkdir -p /var/r/ && \
     cp -r bin/ lib/ etc/ library/ doc/ modules/ share/ /var/r/

Diff for: awspack/build.sh

@@ -18,7 +18,7 @@ rm -rf ${BUILD_DIR}
 
 mkdir -p ${BUILD_DIR}/layer/
 docker run -v ${BUILD_DIR}/layer/:/var/awspack -v ${BASE_DIR}/entrypoint.sh:/entrypoint.sh \
-    lambda-r:${VERSION} /entrypoint.sh
+    lambda-r:build-${VERSION} /entrypoint.sh
 sudo chown -R $(whoami):$(whoami) ${BUILD_DIR}/layer/
 cd ${BUILD_DIR}/layer/
 chmod -R 755 .

Diff for: docker_build.sh

@@ -10,4 +10,4 @@ else
     VERSION=$1
 fi
 
-docker build -t lambda-r:${VERSION} --build-arg VERSION=${VERSION} .
+docker build -t lambda-r:build-${VERSION} --build-arg VERSION=${VERSION} .

Diff for: r/build.sh

@@ -17,5 +17,5 @@ R_DIR=/opt/R/
 rm -rf ${BUILD_DIR}
 
 mkdir -p ${BUILD_DIR}/bin/
-docker run -v ${BUILD_DIR}/bin/:/var/r lambda-r:${VERSION}
+docker run -v ${BUILD_DIR}/bin/:/var/r lambda-r:build-${VERSION}
 sudo chown -R $(whoami):$(whoami) ${BUILD_DIR}/bin/