Merge branch 'dev'

* dev: (59 commits) fix FHEM app layer use nodejs 8.x for i386 fix FHEM_VERSION use nodejs 10 LTS fix command series next try to fix nodejs on arm... remove NPM cache and temp settings use unsafe permission during npm install on arm no nodejs for arm32v5 available; try to fix nodejs on arm by early update first... use nodejs 8 on all platforms fix add libssl during layer build fix newline add transcript draft to build Debian packages for ARM remove placeholder Add SSH client hardening fix label fix FHEM_VERSION improve Docker hub check fix environment variables ...
fhem · Jan 15, 2019 · dc0dd38 · dc0dd38
2 parents 58d4969 + 9646ff7
commit dc0dd38
Show file tree

Hide file tree

Showing 14 changed files with 463 additions and 113 deletions.
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -0,0 +1,10 @@
+# Contributing to the FHEM Docker image
+
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+The following is a set of guidelines for contributing to the FHEM Docker image, which is hosted in the [FHEM Organization](https://github.com/fhem) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+#### Table Of Contents
+
+[Code of Conduct](CODE_OF_CONDUCT.md)
+[How to create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,11 @@
 language: bash
 services: docker
 
+branches:
+  only:
+    - dev
+    - /v\d+.\d+.*/
+
 # amd64 toolchain (used as a base for non-sudo compilation, which is faster) 
 include: &toolchain_amd64
   sudo: false
@@ -74,7 +79,7 @@ include: &toolchain_linux_arm32v7
     - ARCH=arm32v7
     - DPKG_ARCH=armhf
     - QEMU_ARCH=arm
-    - NPM_ARCH=arm
+    - NPM_ARCH=armhf
     - GNU_TRIPLET=arm-linux-gnueabihf
     - GNU_MULTILIB_TRIPLET=arm-linux-gnueabihf
     - GPP_COMPILER=arm-linux-gnueabihf-g++
@@ -89,7 +94,7 @@ include: &toolchain_linux_arm64v8
     - ARCH=arm64v8
     - DPKG_ARCH=arm64
     - QEMU_ARCH=aarch64
-    - NPM_ARCH=arm
+    - NPM_ARCH=arm64
     - GNU_TRIPLET=aarch64-linux-gnu
     - GNU_MULTILIB_TRIPLET=arm-linux-gnueabihf
     - GPP_COMPILER=aarch64-linux-gnu-g++
@@ -112,31 +117,30 @@ matrix:
 notifications:
   email: false
 
-before_install:
-  - export CXX="${GPP_COMPILER}" CC="${GCC_COMPILER}" DOCKER_CONFIG="./";
-  - if [[ "${CROSS_TOOLCHAIN}" == "true" ]]; then
-      sudo rm -rf /etc/apt/sources.list.d/**;
-      sudo rm /etc/apt/sources.list;
-      echo "deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu xenial main universe multiverse restricted" | sudo tee /etc/apt/sources.list;
-      echo "deb [arch=${DPKG_ARCH}] http://ports.ubuntu.com/ubuntu-ports xenial main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list;
-      echo "deb-src http://archive.ubuntu.com/ubuntu xenial main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list;
-      sudo dpkg --add-architecture ${DPKG_ARCH};
-      sudo apt-get update -yq;
-      curl -fsSL https://github.com/multiarch/qemu-user-static/releases/download/v3.0.0/x86_64_qemu-${QEMU_ARCH}-static.tar.gz | tar zx -C ./src/;
-    fi
-  # Update FHEM repository
-  - svn co https://svn.fhem.de/fhem/ ./src/fhem >/dev/null;
+before_install: |
+  export CXX="${GPP_COMPILER}" CC="${GCC_COMPILER}" DOCKER_CONFIG="./";
+  if [[ "${CROSS_TOOLCHAIN}" == "true" ]]; then
+    sudo rm -rf /etc/apt/sources.list.d/**;
+    sudo rm /etc/apt/sources.list;
+    echo "deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu xenial main universe multiverse restricted" | sudo tee /etc/apt/sources.list;
+    echo "deb [arch=${DPKG_ARCH}] http://ports.ubuntu.com/ubuntu-ports xenial main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list;
+    echo "deb-src http://archive.ubuntu.com/ubuntu xenial main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list;
+    sudo dpkg --add-architecture ${DPKG_ARCH};
+    sudo apt-get update -yq;
+    curl -fsSL https://github.com/multiarch/qemu-user-static/releases/download/v3.1.0-2/x86_64_qemu-${QEMU_ARCH}-static.tar.gz | tar zx -C ./src/;
+  fi
+  svn co https://svn.fhem.de/fhem/trunk ./src/fhem/trunk >/dev/null;
 
-install:
-  - travis_wait 120 sleep infinity & ./scripts/build.sh;
+install: |
+  travis_wait 120 sleep infinity & ./scripts/build.sh;
 
-script:
-  - ./scripts/test-integration.sh;
+script: |
+  ./scripts/test-integration.sh;
 
 cache:
   directories:
     - $TRAVIS_BUILD_DIR/src/fhem/
-  
-after_success:
-  - ./scripts/push-docker.sh;
-  - ./scripts/push-docker-manifest.sh;
+
+after_success: |
+  ./scripts/push-docker.sh;
+  ./scripts/push-docker-manifest.sh;