Reset st2-docker with the new docker-compose (Ubuntu Bionic, Python 3)

.circleci/config.yml

@@ -1,135 +1,72 @@
-#
-defaults: &defaults
-  working_directory: /build
-  docker:
-    - image: docker:18.06.0-ce-git
-
-version: 2
+version: 2.1
 jobs:
-  nightly-build:
-    <<: *defaults
+  # Verify docker-compose.yml format for any immediate linting issues
+  docker-compose-lint:
+    docker:
+      - image: docker/compose:latest
     steps:
       - checkout
-      - setup_remote_docker:
-          docker_layer_caching: true
-      - run:
-          name: Install bash
-          command: apk add --no-cache bash coreutils
-      - run:
-          name: Build image
-          command: bin/build.sh
-          environment:
-            BUILD_DEV: true
       - run:
-          name: Save image
-          command: bin/save.sh
-          environment:
-            BUILD_DEV: true
-      - persist_to_workspace:
-          root: /workspace
-          paths:
-            - tar
-  nightly-deploy:
-    <<: *defaults
+          name: Docker-compose lint check
+          command: docker-compose config
+
+  # Run docker-compose install and verify st2 deployment
+  docker-compose-up:
+    working_directory: ~/docker
+    machine:
+      # Available images https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
+      image: ubuntu-1604:201903-01
     steps:
       - checkout
-      - attach_workspace:
-          at: /workspace
-      - setup_remote_docker:
-          docker_layer_caching: true
       - run:
-          name: Install bash
-          command: apk add --no-cache bash coreutils
+          name: Pull Docker Images
+          command: docker-compose pull
       - run:
-          name: Load image
-          command: bin/load.sh
+          name: Start st2 with docker-compose
+          command: docker-compose up --detach
       - run:
-          name: Deploy image to Docker Hub
+          name: Run st2 smoke-tests
           command: |
-            docker login --username ${DOCKER_USERNAME} --password ${DOCKER_PASSWORD}
-            bin/deploy.sh
-          environment:
-            BUILD_DEV: true
-  build:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker:
-          docker_layer_caching: true
-      - run:
-          name: Install bash
-          command: apk add --no-cache bash coreutils
+            # TODO: Replace with 'docker-compose run status'
+            # Example: https://github.com/docker/compose/issues/374#issuecomment-310266246
+            sleep 45
+            # TODO: Replace with more organized BATS tests 'docker-compose run tests'
+            # Example: https://github.com/StackStorm/stackstorm-ha/blob/master/tests/st2tests.sh
+            docker-compose exec st2client st2 action list --pack=core
+            docker-compose exec st2client st2 run core.local cmd=date
+            docker-compose exec st2client st2 pack install github
+            docker-compose exec st2client st2 execution list
       - run:
-          name: Build image
-          command: bin/build.sh
-      - run:
-          name: Save image
-          command: bin/save.sh
-      - persist_to_workspace:
-          root: /workspace
-          paths:
-            - tar
-  deploy:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: /workspace
-      - checkout
-      - setup_remote_docker:
-          docker_layer_caching: true
-      - run:
-          name: Install bash
-          command: apk add --no-cache bash coreutils
-      - run:
-          name: Load image from workspace
-          command: bin/load.sh
-      - run:
-          name: Deploy image to Docker Hub
-          command: |
-            docker login --username ${DOCKER_USERNAME} --password ${DOCKER_PASSWORD}
-            bin/deploy.sh
+          when: always
+          name: List created Services
+          command: docker-compose ps
 
 workflows:
   version: 2
-  nightly-workflow:
-    triggers:
-      - schedule:
-          cron: "0 9 * * *"
-          filters:
-            branches:
-              only:
-                - master
+  docker-compose:
     jobs:
-      - nightly-build:
-          filters:
-            tags:
-              only:
-                - /.*/
-      - nightly-deploy:
+      - docker-compose-lint
+      - docker-compose-up:
           requires:
-            - nightly-build
-          filters:
-            branches:
-              only:
-                - master
-            tags:
-              only:
-                - /^v.*/
-  commit-workflow:
+            - docker-compose-lint
+
+  # Nightly run docker-compose install and ensure no regressions for st2 deployment in 'master' branch
+  docker-compose-nightly:
     jobs:
-      - build:
-          filters:
-            tags:
-              only:
-                - /.*/
-      - deploy:
+      - docker-compose-lint
+      - docker-compose-up:
           requires:
-            - build
+            - docker-compose-lint
+    triggers:
+      - schedule:
+          cron: "0 1 * * *"
           filters:
             branches:
               only:
                 - master
-                - feature/circleci
-            tags:
-              only:
-                - /^v.*/
+
+experimental:
+  notify:
+    branches:
+      only:
+        - master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,10 +8,10 @@ about: Create a report to help us improve the stackstorm docker image
 A clear and concise description of what the problem is.
 
 **Versions**
- - Host OS: [e.g. Ubuntu 16.04]
- - docker: [e.g. 18.03.1-ce]
+ - Host OS: [e.g. Ubuntu 18.04]
+ - docker: [e.g. 18.09.1-ce]
  - docker-compose: [e.g. 1.21.1]
- - stackstorm/stackstorm image: [e.g. v2.7.1]
+ - stackstorm version: [e.g. v3.3.0]
 
 **To Reproduce**
 If necessary, please specify steps to reproduce the behavior.

CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+## 2020-07-17
+* Replace docker-compose with a new deployment based on [stackstorm/st2-dockerfiles](https://github.com/StackStorm/st2-dockerfiles/) images relying on `Ubuntu Bionic` and `python 3` since st2 `v3.3dev` (#192)
+
+## 2020-05-26
+* Deprecate demo all-in-one docker-compose deployment based on outdated `Ubuntu Trusty` with `python 2`, unsupported since st2 `v3.1.0` (#191)
+
+## 2018-06-28
+* Add `st2workflowengine` to `entrypoint-1ppc.sh` and `compose-1ppc/docker-compose.yml`.
+
+## 2018-06-18
+* The `TAG` environment variable is replaced by `ST2_IMAGE_TAG`.
+
+## 2018-02-27
+* Pin DB's to specific, tested versions.
+
+## 2017-10-23
+* Rename `/entrypoint.d/` to `/st2-docker/entrypoint.d/`.

LICENSE

@@ -186,6 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
+   Copyright 2020 The StackStorm Authors.
    Copyright 2017 StackStorm, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");