Merge pull request #16 from ballab1/dev

ballab1 · web-flow · commit ec1c1b71211a · 2018-10-23T12:01:57.000-04:00
changed to use OS provided versions of cpanminus
diff --git a/Dockerfile b/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
diff --git a/build/action_folders/02.packages/04.carton.alpine b/build/action_folders/02.packages/04.carton.alpine
@@ -2,4 +2,5 @@
 
 declare -a PKGS=( libxml2
                   libxml2-dev
+                  perl-app-cpanminus
                   python )
diff --git a/build/action_folders/02.packages/04.carton.fedora b/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
+                  )
diff --git a/build/action_folders/02.packages/04.carton.ubuntu b/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
+                  )
diff --git a/build/action_folders/05.applications/01.cpanimus b/build/action_folders/05.applications/01.cpanimus
diff --git a/build/action_folders/05.applications/02.carton b/build/action_folders/05.applications/02.carton
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-( cpan install Carton )
+PERL_MM_USE_DEFAULT=1 cpan install Carton ||:
diff --git a/docker-compose.yml b/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}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-( cpan install Carton )`
	`3`	`+PERL_MM_USE_DEFAULT=1 cpan install Carton \|\|:`