changed to use OS provided versions of cpanminus

.dockerignore

@@ -7,13 +7,13 @@
 .cbfProject
 
 #build files
-docker-compose.yml
+docker-compose.*
 bin/*
 vols*/*
-cbf/CRF.properties
-CBF.properties
-scanned.paths
-*.loaded
+**/CRF.properties
+**/CBF.properties
+**/scanned.paths
+**/*.loaded
 
 # Information files
 LICENSE

.gitattributes

@@ -1,2 +1,10 @@
+*.bmp filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.hpi filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.jpi filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
 *.tgz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+

.gitignore

@@ -21,7 +21,7 @@ logs
 vols/*
 vols-rw/*
 build/container_build_framework*
-cbf/CRF.properties
-CBF.properties
+**/CRF.properties
+**/CBF.properties
 scanned.paths
 *.loaded

Dockerfile

@@ -15,8 +15,8 @@ ENV DEBUG_TRACE=0
 
 
 # cpanimus version being bundled in this docker image
-ARG CPANIMUS_VERSION=1.7044
-LABEL cpanimus.version=$CPANIMUS_VERSION  
+ARG CPANMINUS_VERSION=1.7044
+LABEL cpanminus.version=$CPANMINUS_VERSION  
 
 
 # build content

build/action_folders/02.packages/04.carton.alpine

@@ -2,4 +2,5 @@
 
 declare -a PKGS=( libxml2
                   libxml2-dev
+                  perl-app-cpanminus
                   python )

build/action_folders/02.packages/04.carton.fedora

@@ -0,0 +1,12 @@
+# carton Packages
+
+declare -a PKGS=( libxml2
+                  libxml2-devel
+                  python
+                  libssh2
+                  libuuid-devel
+#                  rh-perl526-perl-App-cpanminus
+                  rh-perl526-perl-Env
+                  uuid
+                  uuid-devel
+                  )

build/action_folders/02.packages/04.carton.ubuntu

@@ -0,0 +1,11 @@
+# carton Packages
+
+declare -a PKGS=( libxml2
+                  libxml2-devel
+                  python
+                  cpanimus
+                  libssh2
+                  libuuid-devel
+                  uuid
+                  uuid-devel
+                  )

build/action_folders/05.applications/02.carton

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-( cpan install Carton )
+PERL_MM_USE_DEFAULT=1 cpan install Carton ||:

build/build.sh

@@ -28,15 +28,9 @@ case "$(osname)" in
             apk update
             apk add --no-cache bash ca-certificates openssl
         fi;;
-    centos)
+    centos|fedora)
         # ensure we have wget support
-        if [ -z "$(which wget)" ]; then
-            yum update
-            yum install -y wget ca-certificates openssl
-        fi;;
-    fedora)
-        # ensure we have wget support
-        if [ -z "$(which wget)" ]; then
+        if [ ! -e /usr/bin/wget ]; then
             yum update
             yum install -y wget ca-certificates openssl
         fi;;
@@ -62,10 +56,10 @@ elif [ "$CBF_VERSION" ]; then
     CBF_URL="https://github.com/ballab1/container_build_framework/archive/${CBF_VERSION}.tar.gz"
     echo "Downloading CBF:$CBF_VERSION from $CBF_URL"
 
-    if [ $(which wget) ]; then
+    if [ -e /usr/bin/wget ]; then
         wget --no-check-certificate --quiet --output-document="$CBF_TGZ" "$CBF_URL" || die "Failed to download $CBF_URL"
 
-    elif [ $(which curl) ]; then
+    elif [ -e /usr/bin/curl ]; then
         curl --insecure --silent --output "$CBF_TGZ" "$CBF_URL" || die "Failed to download $CBF_URL"
 
     else
@@ -92,4 +86,4 @@ fi
 
 echo "loading framework from ${cbf_dir}"
 chmod 755 "${cbf_dir}/cbf/bin/build.sh"
-exec "${cbf_dir}/cbf/bin/build.sh" "$@"
+exec "${cbf_dir}/cbf/bin/build.sh" "$@"

docker-compose.yml

@@ -6,7 +6,7 @@ services:
             args:
                 CBF_VERSION: ${CBF_VERSION:-}
                 CONTAINER_NAME: perl-carton
-                CPANIMUS_VERSION: ${CPANIMUS_VERSION:-1.7044}
+                CPANMINUS_VERSION: ${CPANMINUS_VERSION:-1.7044}
                 FROM_BASE: ${DOCKER_REGISTRY:-}${CONTAINER_OS:-}perl/${PERL_VERSION:-5.26.2}:${BASE_TAG:-latest}
             cache_from:
                 - ${DOCKER_REGISTRY:-}${CONTAINER_OS:-}alpine:3.8
@@ -26,4 +26,4 @@ services:
         container_name: carton
         environment:
             DEBUG_TRACE: ${DEBUG_TRACE:-0}
-        image: ${DOCKER_REGISTRY:-}${CONTAINER_OS:-}perl-carton/${CPANIMUS_VERSION:-1.7044}:${CONTAINER_TAG:-latest}
+        image: ${DOCKER_REGISTRY:-}${CONTAINER_OS:-}perl-carton/${CPANMINUS_VERSION:-1.7044}:${CONTAINER_TAG:-latest}