update from upstream

.github/workflows/kitchen.yml

@@ -0,0 +1,223 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+name: 'Kitchen (Linux)'
+'on': ['push', 'pull_request']
+
+jobs:
+  kitchen:
+    runs-on: 'ubuntu-20.04'
+    env:
+      CHANGE_MINIKUBE_NONE_USER: true
+      MINIKUBE_WANTUPDATENOTIFICATION: false
+      MINIKUBE_WANTREPORTERRORPROMPT: false
+      MINIKUBE_HOME: '$HOME'
+      KUBECONFIG: '$HOME/.kube/config'
+    strategy:
+      fail-fast: false
+      matrix:
+        instance:
+          # - archive-debian-11-tiamat-py3
+          # - archive-debian-10-tiamat-py3
+          # - archive-debian-9-tiamat-py3
+          # - archive-ubuntu-2204-tiamat-py3
+          # - archive-ubuntu-2004-tiamat-py3
+          # - archive-ubuntu-1804-tiamat-py3
+          # - archive-centos-stream8-tiamat-py3
+          # - archive-centos-7-tiamat-py3
+          # - archive-amazonlinux-2-tiamat-py3
+          # - archive-oraclelinux-8-tiamat-py3
+          # - archive-oraclelinux-7-tiamat-py3
+          # - archive-almalinux-8-tiamat-py3
+          # - archive-rockylinux-8-tiamat-py3
+          # - archive-debian-11-master-py3
+          # - package-debian-11-master-py3
+          # - repo-debian-11-master-py3
+          # - clean-debian-11-master-py3
+          # - composeclean-debian-11-master-py3
+          # - dockeronly-debian-11-master-py3
+          - debian-11-master-py3
+          # - archive-debian-10-master-py3
+          # - package-debian-10-master-py3
+          # - repo-debian-10-master-py3
+          # - composeclean-debian-10-master-py3
+          # - dockeronly-debian-10-master-py3
+          - debian-10-master-py3
+          # - archive-debian-9-master-py3
+          # - package-debian-9-master-py3
+          # - repo-debian-9-master-py3
+          # - clean-debian-9-master-py3
+          # - composeclean-debian-9-master-py3
+          # - dockeronly-debian-9-master-py3
+          - debian-9-master-py3
+          # - archive-ubuntu-2204-master-py3
+          # - package-ubuntu-2204-master-py3
+          # - repo-ubuntu-2204-master-py3
+          # - clean-ubuntu-2204-master-py3
+          # - composeclean-ubuntu-2204-master-py3
+          # - dockeronly-ubuntu-2204-master-py3
+          - ubuntu-2204-master-py3
+          # - archive-ubuntu-2004-master-py3
+          # - package-ubuntu-2004-master-py3
+          # - repo-ubuntu-2004-master-py3
+          # - clean-ubuntu-2004-master-py3
+          # - composeclean-ubuntu-2004-master-py3
+          # - dockeronly-ubuntu-2004-master-py3
+          - ubuntu-2004-master-py3
+          # - archive-ubuntu-1804-master-py3
+          # - package-ubuntu-1804-master-py3
+          # - repo-ubuntu-1804-master-py3
+          # - clean-ubuntu-1804-master-py3
+          # - composeclean-ubuntu-1804-master-py3
+          # - dockeronly-ubuntu-1804-master-py3
+          - ubuntu-1804-master-py3
+          # - archive-centos-stream8-master-py3
+          # - package-centos-stream8-master-py3
+          # - repo-centos-stream8-master-py3
+          # - clean-centos-stream8-master-py3
+          # - composeclean-centos-stream8-master-py3
+          # - dockeronly-centos-stream8-master-py3
+          - centos-stream8-master-py3
+          # - archive-centos-7-master-py3
+          # - package-centos-7-master-py3
+          # - repo-centos-7-master-py3
+          # - clean-centos-7-master-py3
+          # - composeclean-centos-7-master-py3
+          # - dockeronly-centos-7-master-py3
+          - centos-7-master-py3
+          # - archive-fedora-36-master-py3
+          # - package-fedora-36-master-py3
+          # - repo-fedora-36-master-py3
+          # - clean-fedora-36-master-py3
+          # - composeclean-fedora-36-master-py3
+          # - dockeronly-fedora-36-master-py3
+          - fedora-36-master-py3
+          # - archive-fedora-35-master-py3
+          # - package-fedora-35-master-py3
+          # - repo-fedora-35-master-py3
+          # - clean-fedora-35-master-py3
+          # - composeclean-fedora-35-master-py3
+          # - dockeronly-fedora-35-master-py3
+          - fedora-35-master-py3
+          # - archive-opensuse-leap-153-master-py3
+          # - package-opensuse-leap-153-master-py3
+          # - repo-opensuse-leap-153-master-py3
+          # - clean-opensuse-leap-153-master-py3
+          # - composeclean-opensuse-leap-153-master-py3
+          # - dockeronly-opensuse-leap-153-master-py3
+          # - opensuse-leap-153-master-py3
+          # - archive-opensuse-tmbl-latest-master-py3
+          # - package-opensuse-tmbl-latest-master-py3
+          # - repo-opensuse-tmbl-latest-master-py3
+          - clean-opensuse-tmbl-latest-master-py3
+          # - composeclean-opensuse-tmbl-latest-master-py3
+          # - dockeronly-opensuse-tmbl-latest-master-py3
+          # - opensuse-tmbl-latest-master-py3
+          - archive-amazonlinux-2-master-py3
+          # - package-amazonlinux-2-master-py3
+          # - repo-amazonlinux-2-master-py3
+          # - clean-amazonlinux-2-master-py3
+          # - composeclean-amazonlinux-2-master-py3
+          # - dockeronly-amazonlinux-2-master-py3
+          # - amazonlinux-2-master-py3
+          - archive-oraclelinux-8-master-py3
+          # - package-oraclelinux-8-master-py3
+          # - repo-oraclelinux-8-master-py3
+          # - clean-oraclelinux-8-master-py3
+          # - composeclean-oraclelinux-8-master-py3
+          # - dockeronly-oraclelinux-8-master-py3
+          # - oraclelinux-8-master-py3
+          - archive-oraclelinux-7-master-py3
+          # - package-oraclelinux-7-master-py3
+          # - repo-oraclelinux-7-master-py3
+          # - clean-oraclelinux-7-master-py3
+          # - composeclean-oraclelinux-7-master-py3
+          # - dockeronly-oraclelinux-7-master-py3
+          # - oraclelinux-7-master-py3
+          # - archive-arch-base-latest-master-py3
+          # - package-arch-base-latest-master-py3
+          # - clean-arch-base-latest-master-py3
+          # - composeclean-arch-base-latest-master-py3
+          # - dockeronly-arch-base-latest-master-py3
+          - arch-base-latest-master-py3
+          # - archive-gentoo-stage3-latest-master-py3
+          # - package-gentoo-stage3-latest-master-py3
+          # - repo-gentoo-stage3-latest-master-py3
+          # - clean-gentoo-stage3-latest-master-py3
+          # - composeclean-gentoo-stage3-latest-master-py3
+          # - dockeronly-gentoo-stage3-latest-master-py3
+          # - gentoo-stage3-latest-master-py3
+          - archive-gentoo-stage3-systemd-master-py3
+          # - package-gentoo-stage3-systemd-master-py3
+          # - repo-gentoo-stage3-systemd-master-py3
+          # - clean-gentoo-stage3-systemd-master-py3
+          # - composeclean-gentoo-stage3-systemd-master-py3
+          # - dockeronly-gentoo-stage3-systemd-master-py3
+          # - gentoo-stage3-systemd-master-py3
+          # - archive-almalinux-8-master-py3
+          # - package-almalinux-8-master-py3
+          # - repo-almalinux-8-master-py3
+          # - clean-almalinux-8-master-py3
+          # - composeclean-almalinux-8-master-py3
+          # - dockeronly-almalinux-8-master-py3
+          - almalinux-8-master-py3
+          # - archive-rockylinux-8-master-py3
+          # - package-rockylinux-8-master-py3
+          # - repo-rockylinux-8-master-py3
+          # - clean-rockylinux-8-master-py3
+          # - composeclean-rockylinux-8-master-py3
+          # - dockeronly-rockylinux-8-master-py3
+          - rockylinux-8-master-py3
+          # - archive-debian-11-3004-1-py3
+          # - archive-debian-10-3004-1-py3
+          # - archive-debian-9-3004-1-py3
+          # - archive-ubuntu-2204-3004-1-py3
+          # - archive-ubuntu-2004-3004-1-py3
+          # - archive-ubuntu-1804-3004-1-py3
+          # - archive-centos-stream8-3004-1-py3
+          # - archive-centos-7-3004-1-py3
+          # - archive-fedora-36-3004-1-py3
+          # - archive-fedora-35-3004-1-py3
+          # - archive-amazonlinux-2-3004-1-py3
+          # - archive-oraclelinux-8-3004-1-py3
+          # - archive-oraclelinux-7-3004-1-py3
+          # - archive-arch-base-latest-3004-1-py3
+          # - archive-gentoo-stage3-latest-3004-1-py3
+          # - archive-gentoo-stage3-systemd-3004-1-py3
+          # - archive-almalinux-8-3004-1-py3
+          # - archive-rockylinux-8-3004-1-py3
+          # - archive-opensuse-leap-153-3004-0-py3
+          # - archive-opensuse-tmbl-latest-3004-0-py3
+          # - archive-debian-10-3003-4-py3
+          # - archive-debian-9-3003-4-py3
+          # - archive-ubuntu-2004-3003-4-py3
+          # - archive-ubuntu-1804-3003-4-py3
+          # - archive-centos-stream8-3003-4-py3
+          # - archive-centos-7-3003-4-py3
+          # - archive-amazonlinux-2-3003-4-py3
+          # - archive-oraclelinux-8-3003-4-py3
+          # - archive-oraclelinux-7-3003-4-py3
+          # - archive-almalinux-8-3003-4-py3
+    steps:
+      - name: 'Check out code'
+        uses: 'actions/checkout@v2'
+      - name: 'Set up Bundler cache'
+        uses: 'actions/cache@v1'
+        with:
+          path: 'vendor/bundle'
+          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
+          restore-keys: "${{ runner.os }}-gems-"
+      - name: 'Install Bundler'
+        run: |
+          sudo gem install bundler \
+            -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" \
+            --quiet --no-document
+      - name: 'Run Bundler'
+        run: |
+          ruby --version
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: 'Run Test Kitchen'
+        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
+        env:
+          CHEF_LICENSE: 'accept-no-persist'

.gitignore

@@ -91,6 +91,9 @@ celerybeat-schedule
 venv/
 ENV/
 
+# visual studio
+.vs/
+
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -120,3 +123,12 @@ docs/*.md
 Dockerfile.*_*
 ignore/
 tmp/
+
+# `salt-formula` -- Vagrant Specific files
+.vagrant
+top.sls
+!test/salt/pillar/top.sls
+
+# `suricata-formula` -- Platform binaries
+*.rpm
+*.deb

.gitlab-ci.yml

@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+###############################################################################
+# Define all YAML node anchors
+###############################################################################
+.node_anchors:
+  # `only` (also used for `except` where applicable)
+  only_branch_master_parent_repo: &only_branch_master_parent_repo
+    - 'master@saltstack-formulas/docker-formula'
+  # `stage`
+  stage_lint: &stage_lint 'lint'
+  stage_release: &stage_release 'release'
+  # `image`
+  image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
+  image_precommit: &image_precommit
+    name: 'myii/ssf-pre-commit:2.9.2'
+    entrypoint: ['/bin/bash', '-c']
+  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
+  image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
+
+###############################################################################
+# Define stages and global variables
+###############################################################################
+stages:
+  - *stage_lint
+  - *stage_release
+
+###############################################################################
+# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
+###############################################################################
+commitlint:
+  stage: *stage_lint
+  image: *image_commitlint
+  script:
+    # Add `upstream` remote to get access to `upstream/master`
+    - 'git remote add upstream
+       https://gitlab.com/saltstack-formulas/docker-formula.git'
+    - 'git fetch --all'
+    # Set default commit hashes for `--from` and `--to`
+    - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
+    - 'export COMMITLINT_TO="${CI_COMMIT_SHA}"'
+    # `coqbot` adds a merge commit to test PRs on top of the latest commit in
+    # the repo; amend this merge commit message to avoid failure
+    - |
+      if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \
+      && [ "${CI_COMMIT_BRANCH}" != "master" ]; then
+        git commit --amend -m \
+          'chore: reword coqbot merge commit message for commitlint'
+        export COMMITLINT_TO=HEAD
+      fi
+    # Run `commitlint`
+    - 'commitlint --from "${COMMITLINT_FROM}"
+                  --to   "${COMMITLINT_TO}"
+                  --verbose'
+
+pre-commit:
+  stage: *stage_lint
+  image: *image_precommit
+  # https://pre-commit.com/#gitlab-ci-example
+  variables:
+    PRE_COMMIT_HOME: '${CI_PROJECT_DIR}/.cache/pre-commit'
+  cache:
+    key: '${CI_JOB_NAME}'
+    paths:
+      - '${PRE_COMMIT_HOME}'
+  script:
+    - 'pre-commit run --all-files --color always --verbose'
+
+# Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
+# - The `pre-commit` check will only be available for formulas that pass the default
+#   `rubocop` check -- and must continue to do so
+# - This job is allowed to fail, so can be used for all formulas
+# - Furthermore, this job uses all of the latest `rubocop` features & cops,
+#   which will help when upgrading the `rubocop` linter used in `pre-commit`
+rubocop:
+  allow_failure: true
+  stage: *stage_lint
+  image: *image_rubocop
+  script:
+    - 'rubocop -d -P -S --enable-pending-cops'
+
+###############################################################################
+# `release` stage: `semantic-release`
+###############################################################################
+semantic-release:
+  only: *only_branch_master_parent_repo
+  stage: *stage_release
+  image: *image_semanticrelease
+  variables:
+    MAINTAINER_TOKEN: '${GH_TOKEN}'
+  script:
+    # Update `AUTHORS.md`
+    - '${HOME}/go/bin/maintainer contributor'
+    # Run `semantic-release`
+    - 'semantic-release'