Release Candidate 1

.circleci/build.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+work_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+usage=("" \
+"Usage: $0" \
+"    CircleCI needs a primary image with docker-in-docker backend." \
+"    To build it use deployment/build.sh script to push to image registry and tag it:" \
+"        deployment/images/build.sh secondary betothreeprod/cci-mariadb arm64v8-latest" \
+"Then you can run composition process: sudo docker-compose up --build" \
+"")
+[ ! "$(command -v circleci)" ] && curl -fLSs https://circle.ci/cli | bash
+# https://github.com/koalaman/shellcheck/wiki/SC2207
+# shellcheck source=../deploy.sh
+mapfile -t dock < <(find "${work_dir}/../deployment/images" -name "Dockerfile.x86_64")
+[ "$#" -lt 1 ] && printf "Usage: %s <repository>" "$0" && exit 0
+for d in "${dock[@]}"; do
+  dir=$(dirname "$d")
+  docker_build "$dir" "." "$1/$(basename "$dir")" "$(arch)"
+done
+sed -e "/custom_checkout:/s/\"\"/\"\/tmp\/_circleci_local_build_repo\"/g" "${work_dir}/config.yml" | circleci config process - > "${work_dir}/config-compat.yml"
+circleci local execute -c "${work_dir}/config-compat.yml" || echo -e "${usage[0]}"

.circleci/config.yml

@@ -1,94 +1,128 @@
-# PHP CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-php/ for more details
-#
-version: 2
+version: 2.1
+aliases:
+  - &deps
+    run:
+      name: Install dependencies
+      command: |
+        git submodule sync
+        git submodule update --init --recursive
+        apk update \
+          && apk add \
+            npm \
+            php7-session \
+          && apk del build-base \
+          && rm -rf /var/cache/apk/*
+        npm ci
+        npm link balena-cloud-apps
+orbs:
+  shellcheck: circleci/shellcheck@1.3.16
 jobs:
   build:
+    docker:
+    - image: betothreeprod/intel-nuc-node-php7
+    - image: betothreeprod/mariadb-intel-nuc
+      environment:
+        PUID: 0
+        PGID: 0
+        TZ: Europe/Paris
+        MYSQL_ROOT_PASSWORD: mariadb
+        MYSQL_HOST: localhost
+        MYSQL_DATABASE: aria_db
+        MYSQL_USER: maria
+        MYSQL_PASSWORD: maria-abc
+    shell: /bin/bash -leo pipefail
     environment:
-      DB: Mysql
-      # a host alias or IP address
-      MYSQL_SERVICE_HOST: 192.168.99.100
-      MYSQL_SERVICE_PORT: 3306
-      TEST_MYSQL_SERVICE_HOST: 192.168.99.100
-      TEST_MYSQL_SERVICE_PORT: 3306
-      DATABASE_NAME: phpcms
-      DATABASE_SERVICE_NAME: MYSQL
-      #(optional)
-      #WEBHOOK_URL: <discordapp-url>
-      # Persistent connection credentials
-      DATABASE_USER: root
-      # overrides docker-compose-alias.sh -p=<password>
-      DATABASE_PASSWORD: pdocker
-      # Just add TEST_DATABASE_USER and TEST_DATABASE_PASSWORD
-      TEST_DATABASE_USER: ubuntu
-      # overrides docker-compose-alias.sh -t=<password>
-      TEST_DATABASE_PASSWORD: ptest
-      # CakePHP generated
-      #CAKEPHP_SECRET_TOKEN: <secret-token>
-      #CAKEPHP_SECRET_SALT: <secret-salt>
-      #CAKEPHP_SECURITY_CIPHER_SEED: <cipher-seed>
-      # Generated by ./configure.sh -h
-      GET_HASH_PASSWORD: ${GET_HASH_PASSWORD}
+    - BASH_ENV: /etc/profile
+    - DKR_ARCH: x86_64
+    - MYSQL_HOST: 127.0.0.1
+    - MYSQL_TCP_PORT: 3306
+    working_directory: /var/www/html/
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+          - v1-dependencies-{{ checksum "package-lock.json" }}
+          - v1-dependencies-{{ checksum "composer.lock" }}
+    - setup_remote_docker:
+        docker_layer_caching: false
+    - *deps
+    - save_cache:
+        key: v1-dependencies-{{ checksum "composer.lock" }}
+        paths:
+        - app/Vendor
+        - webroot/php-cms
+    - save_cache:
+        key: v1-dependencies-{{ checksum "package-lock.json" }}
+        paths:
+        - $HOME/.npm
+    - run:
+        name: Set architecture and Setup Environment Variables
+        command: |
+          balena_deploy . $DKR_ARCH --nobuild --exit
+    - run:
+        name: Waiting for Mysql to be ready
+        command: |
+          set -x
+          for i in `seq 1 10`;
+          do
+            nc -z $MYSQL_HOST $MYSQL_TCP_PORT && echo Success && exit 0
+            echo -n .
+            sleep 1
+          done
+          echo 'Failed waiting for Mysql' && exit 1
+    - run:
+        command: |
+          set -u
+          mkdir -p ./app/build/logs
+          mkdir -p ~/phpunit
+          ./test-cake.sh --circle
+          . common.env && cat $MYPHPCMS_DIR/e13/etc/constantes.properties | grep PASSWORD_ADMIN | head -c 18
+        when: always
+    - persist_to_workspace:
+        root: app/
+        paths:
+        - Config
+  compose:
     docker:
-      # Specify the version you desire here
-      - image: circleci/php:7.1-node-browsers
-        environment:
-          DOCKER_OS_NAME: linux
-          DOCKER_PHP_VERSION: 7.1
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # Using the RAM variation mitigates I/O contention
-      # for database intensive operations.
-      # - image: circleci/mysql:5.7-ram
-      - image: circleci/mysql:5.7
-        container_name: mysql
-        environment:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_ROOT_PASSWORD: 'pdocker'
-          MYSQL_DATABASE: phpcms
-
+    - image: betothreeprod/dind-php7
+    shell: /bin/bash -leo pipefail
+    environment:
+    - BASH_ENV: /etc/profile
+    - DKR_ARCH: x86_64
     steps:
-      - checkout
-      - run: git submodule update --init --recursive
-
-      - run: sudo apt update # PHP CircleCI 2.0 Configuration File# PHP CircleCI 2.0 Configuration File sudo apt install zlib1g-dev libsqlite3-dev
-      - run: sudo docker-php-ext-install zip
-      - run: sudo apt-get install mariadb-client
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-            # "composer.lock" can be used if it is committed to the repo
-            - v1-dependencies-{{ checksum "composer.lock" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
-      - run: composer install -n --prefer-dist
-
-      - save_cache:
-          key: v1-dependencies-{{ checksum "composer.lock" }}
-          paths:
-            - ./app/Vendor/
-
-      - run: ./test-cake.sh -v --docker -p=$DATABASE_PASSWORD -t=$TEST_DATABASE_PASSWORD #| grep Test
-      # Installing and Using docker-compose
-      - run:
-          name: Install Docker Compose
-          command: |
-            curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
-            chmod +x ~/docker-compose
-            sudo mv ~/docker-compose /usr/local/bin/docker-compose
-      - setup_remote_docker:   # (2)
-          docker_layer_caching: true # (3)
-
-      # use a primary image that already has Docker (recommended)
-      # build and push Docker image
-      # (4)
-      - run: |
+    - checkout
+    - attach_workspace:
+        at: app
+    - restore_cache:
+        keys:
+          - v1-dependencies-{{ checksum "package-lock.json" }}
+          - v1-dependencies-{{ checksum "composer.lock" }}
+    - setup_remote_docker:
+        docker_layer_caching: false
+    - *deps
+    - run:
+        name: Set architecture and Setup Environment Variables
+        command: |
+          balena_deploy . $DKR_ARCH --nobuild --exit
+    - run:
+        command: |
+          set -u
           TAG=0.1.$CIRCLE_BUILD_NUM
-          ./docker-compose-alias.sh -dns=b23prodtm.info -p=$DATABASE_PASSWORD -t=$TEST_DATABASE_PASSWORD  up -d --build
-          docker login -u $DOCKER_USER -p $DOCKER_PASS
-          docker push b23dkr/myphpcms:$TAG
+          docker-compose -f docker-compose.$DKR_ARCH build
+    - store_test_results:
+        path: ~/phpunit
+    - store_artifacts:
+        path: ~/phpunit
+workflows:
+  cleanup:
+    jobs:
+    - shellcheck/check:
+        ignore: 'SC1091,SC2034,SC2096,SC2038'
+  build-and-compose:
+    jobs:
+    - build
+    - compose:
+        requires:
+        - build
+        context: Info-b23prodtm
+  version: 2

.gitignore

@@ -1,8 +1,25 @@
 # User specific & automatically generated files #
 #################################################
-myphpcms*.zip
+.env
+*.old
+*.armhf
+*.aarch64
+*.x86_64
+Dockerfile.*
+!Dockerfile.template
+!Dockerfile.armhf
+!Dockerfile.x86_64
+docker-compose.*
+!docker-compose.yml
+!docker-compose.x86_64
+!docker-compose.armhf
+.circleci/config-compat.yml
+acake2php*.zip
 /app/Config/database.php*
+!/app/Config/database.php
 /app/Config/database.sql*
+/app/Config/Schema/schema.php*
+!/app/Config/Schema/schema.php
 /app/tmp
 /app/Vendor/
 !/app/Vendor/autoload.php
@@ -20,7 +37,13 @@ myphpcms*.zip
 /dist
 /tags
 *.mo
-/bin/composer.phar
+**/composer*.phar
+mysqldb/config/
+mysqldb/conf.d/custom.cnf
+node_modules
+*.log
+etc/apache2/conf.d/site.conf
+etc/apache2/conf.d/ssl_site.conf
 
 # IDE and editor specific files #
 #################################
@@ -40,3 +63,5 @@ Icon?
 ehthumbs.db
 Thumbs.db
 /nbproject/private/
+mysqldb/mysqld/
+mysqld/conf.d/custom.cnf

.gitmodules

@@ -1,9 +1,19 @@
+[submodule "app/webroot/php-cms"]
+	path = app/webroot/php-cms
+	url = https://bitbucket.org/b23prodtm/php-cms.git
+[submodule "python-wifi-connect"]
+	path = python-wifi-connect
+	url = https://github.com/b23prodtm/python-wifi-connect.git
+[submodule "cakephp"]
+	path = cakephp
+	url = git://github.com/cakephp/cakephp.git
+	branch = 2.x
+[submodule "app/Plugin/Datasources"]
+	path = app/Plugin/Datasources
+	url = https://github.com/cakephp/datasources.git
+[submodule "app/Plugin/UpdateShell"]
+	path = app/Plugin/UpdateShell
+	url = https://github.com/b23prodtm/update.git
 [submodule "app/Plugin/Markdown"]
 	path = app/Plugin/Markdown
 	url = https://github.com/b23prodtm/markdown-plugin.git
-[submodule "app/webroot/php_cms"]
-	path = app/webroot/php_cms
-	url = https://bitbucket.org/b23prodtm/php-cms.git
-[submodule ".travis/TravisCI-OSX-PHP"]
-	path = .travis/TravisCI-OSX-PHP
-	url = https://github.com/b23prodtm/TravisCI-OSX-PHP.git

.htaccess

@@ -0,0 +1 @@
+app/webroot/.htaccess

.openshift/cron/weekly/chronograph

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 echo "`date`: `cat $(dirname \"$0\")/chrono.dat`"