Merge pull request #2 from sigdba/develop

Added arch base support

Author: dboitnot

build/Dockerfile.arch

@@ -0,0 +1,14 @@
+FROM archlinux:latest
+
+RUN pacman --noconfirm -Sy git wget curl nmap unzip make zsh openssh filesystem \
+ && sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" \
+ && rm -f /etc/profile.d/perlbin.sh
+
+COPY . /build/
+RUN mkdir -p /home/user \
+ && cp -f /build/docker_zshrc.sh /home/user/.zshrc \
+ && cp -f /build/docker_profile.sh /etc/profile.d/docker_dev.sh \
+ && cp -f /build/docker_launch.sh /launch.sh
+
+RUN chmod 755 /build/add_features.sh \
+ && /build/add_features.sh

build/Dockerfile build/Dockerfile.pythonbuild/Dockerfile renamed to build/Dockerfile.python

@@ -24,9 +24,8 @@ SCRIPT_DIR="$(cd "$SCRIPT_DIR"; pwd -P)"
 [ -f $SCRIPT_DIR/site.conf ] || die "site.conf not found. See site.conf.example"
 . $SCRIPT_DIR/site.conf
 
-# requirements.txt is required
-[ -f $SCRIPT_DIR/requirements.txt ] || die "requirements.txt not found. See requirements.txt.example"
-
+# Set defaults
+[ -z "$DOCKERDEV_BASE" ] && DOCKERDEV_BASE=python
 
 # Figure out which md5 command to use
 if which md5sum >/dev/null; then
@@ -66,12 +65,17 @@ HIST_FILE="$SCRIPT_DIR/.docker-dev-zsh_history"
 [[ "$1" == '-b' ]] && BUILD_IMAGE=y
 if [ -n "$BUILD_IMAGE" ]; then
   cd ${DD_HOME}
-  ln -sf ../requirements.txt ./requirements.txt
+  if [ -f $SCRIPT_DIR/requirements.txt ]; then
+    ln -sf ../requirements.txt ./requirements.txt
+  else
+    rm -f ./requirements.txt
+    touch ./requirements.txt
+  fi
   ln -sf ../site.conf ./site.conf
   TARBALL="${SCRIPT_DIR}/.-docker-dev-build-tmp.tar.gz"
   rm -f ${TARBALL} || die "Error removing old context tarball"
   tar czhf ${TARBALL} . || die "Error creating context tarball"
-  cat ${TARBALL} | docker build -t "$IMAGE" - || die "docker build failed"
+  cat ${TARBALL} | docker build -t "$IMAGE" -f Dockerfile.${DOCKERDEV_BASE} - || die "docker build failed"
 fi
 
 touch "$HIST_FILE"