Merge branch 'rename_dockerfile' into 'master'

renamed dockerfiles to enable auto syntax highlighting

See merge request !87

.gitlab-ci.yml

@@ -177,7 +177,7 @@ jug_dev:default:
     - cp -r spack.yaml containers/jug/spack/spack.yaml
     ## now build our image
     - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
-                   -f containers/jug/Dockerfile.dev
+                   -f containers/jug/dev.Dockerfile
                    --build-arg SPACK_VERSION=${SPACK_VERSION}
                    --build-arg CACHE_BUST=${PACKAGE_HASH}
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
@@ -195,7 +195,7 @@ jug_xl:default:
     BUILD_IMAGE: "jug_xl"
   script:
     - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
-                   -f containers/jug/Dockerfile.xl
+                   -f containers/jug/xl.Dockerfile
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
                    --build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
                    --build-arg NPDET_VERSION=${NPDET_VERSION}
@@ -222,7 +222,7 @@ jug_xl:nightly:
     BUILD_IMAGE: "jug_xl"
   script:
     - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG} 
-                   -f containers/jug/Dockerfile.xl
+                   -f containers/jug/xl.Dockerfile
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
                    --build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-$(git rev-parse HEAD)
                    containers/jug

containers/jug/eic-env.sh

@@ -6,7 +6,6 @@ done
 
 export PS1='eic-shell> \[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33'
-export GREP_OPTIONS='--color=auto'
 
 ## redefine ls and less as functions, as this is something we
 ## can import into our plain bash --norc --noprofile session