Merge pull request #10 from devilbox/build-arm

Build arm

Author: cytopia

.github/workflows/devilbox_action_branch.yml

@@ -16,11 +16,12 @@ name: devilbox_build
 on:
   push:
     paths:
-      - 'tests/**'
       - '.github/workflows/devilbox*.yml'
       - '!.github/workflows/devilbox_schedule.yml'
       - 'Dockerfiles/devilbox/**'
-      - '!Dockerfiles/devilbox/README.md'
+      - '!Dockerfiles/devilbox/*.md'
+      - 'tests/**'
+      - 'Makefile'
 
 
 jobs:

.github/workflows/devilbox_action_pull_request.yml

@@ -16,11 +16,12 @@ name: devilbox_build
 on:
   pull_request:
     paths:
-      - 'tests/**'
       - '.github/workflows/devilbox*.yml'
       - '!.github/workflows/devilbox_schedule.yml'
       - 'Dockerfiles/devilbox/**'
-      - '!Dockerfiles/devilbox/README.md'
+      - '!Dockerfiles/devilbox/*.md'
+      - 'tests/**'
+      - 'Makefile'
 
 
 jobs:

.github/workflows/devilbox_params.yml

@@ -20,7 +20,7 @@ env:
         "NAME":    "PHP",
         "VERSION": ["5.3", "5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"],
         "FLAVOUR": ["devilbox"],
-        "ARCH":    ["linux/amd64"]
+        "ARCH":    ["linux/amd64", "linux/arm64"]
       }
     ]
 

Makefile

@@ -97,9 +97,11 @@ lint-readme:
 #  Docker Targets
 # -------------------------------------------------------------------------------------------------
 .PHONY: build
+build: ARGS+=--build-arg ARCH=$(ARCH)
 build: docker-arch-build
 
 .PHONY: rebuild
+rebuild: ARGS+=--build-arg ARCH=$(ARCH)
 rebuild: docker-arch-rebuild
 
 .PHONY: push

build/skeleton/github/action_branch.yml

@@ -16,11 +16,12 @@ name: __PROJECT___build
 on:
   push:
     paths:
-      - 'tests/**'
       - '.github/workflows/__PROJECT__*.yml'
       - '!.github/workflows/__PROJECT___schedule.yml'
       - 'Dockerfiles/__PROJECT__/**'
-      - '!Dockerfiles/__PROJECT__/README.md'
+      - '!Dockerfiles/__PROJECT__/*.md'
+      - 'tests/**'
+      - 'Makefile'
 
 
 jobs:

build/skeleton/github/action_pull_request.yml

@@ -16,11 +16,12 @@ name: __PROJECT___build
 on:
   pull_request:
     paths:
-      - 'tests/**'
       - '.github/workflows/__PROJECT__*.yml'
       - '!.github/workflows/__PROJECT___schedule.yml'
       - 'Dockerfiles/__PROJECT__/**'
-      - '!Dockerfiles/__PROJECT__/README.md'
+      - '!Dockerfiles/__PROJECT__/*.md'
+      - 'tests/**'
+      - 'Makefile'
 
 
 jobs:

tests/bin/gen-readme.sh

@@ -62,15 +62,19 @@ get_modules() {
 
 	# Process module string into correct format for README.md
 	PHP_MODULES="$( echo "${PHP_MODULES}" | grep -v '^Core' )"  # Remove 'Core'
+	# shellcheck disable=SC2001
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/^\[.*//g' )" # Remove PHP Modules headlines
 	PHP_MODULES="${ALL_MODULES}${PHP_MODULES}"                  # Append all available modules
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sort -fu )"         # Unique
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed '/^\s*$/d' )"   # Remove empty lines
 	PHP_MODULES="$( echo "${PHP_MODULES}" | tr '\r\n' ',' )"    # Newlines to commas
 	PHP_MODULES="$( echo "${PHP_MODULES}" | tr '\n' ',' )"      # Newlines to commas
 	PHP_MODULES="$( echo "${PHP_MODULES}" | tr '\r' ',' )"      # Newlines to commas
+	# shellcheck disable=SC2001
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed	's/^M/,/g' )"   # Newlines to commas
+	# shellcheck disable=SC2001
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/,,/,/g' )"   # Remove PHP Modules headlines
+	# shellcheck disable=SC2001
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/,/\n/g' )"   # Back to newlines
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sort -fu )"         # Unique
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed '/^\s*$/d' )"   # Remove empty lines