Issue 313.dockter.3 (#316)

* #313 added initdatabase * #313 added initdatabase * #313 added initdatabase * #313 Add CI artifacts * #313 Add CI artifacts * #313 Prepare for versioned release * #313 Prepare for versioned release
senzing-garage · Mar 15, 2023 · f29ed35 · f29ed35
1 parent f0ead88
commit f29ed35
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 100 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,3 @@
+# Default code owner
+
+* @Senzing/senzing-community
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/add-dependabot-request-to-project-t-comm.yaml b/.github/workflows/add-dependabot-request-to-project-t-comm.yaml
@@ -0,0 +1,24 @@
+# Based on
+# - https://github.com/srggrs/assign-one-project-github-action
+
+name: add-dependabot-request-to-project-t-comm.yaml
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+env:
+  GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}
+  CREATOR: ${{ github.event.pull_request.user.login }}
+jobs:
+  assign_one_project:
+    name: Add dependabot pull request to Senzing Community project
+    runs-on: ubuntu-latest
+    steps:
+    - name: Assign pull request to project
+      env:
+          BOOL: ${{ contains( env.CREATOR, 'dependabot' ) }}
+      uses: Senzing/github-action-add-issue-to-project@main
+      if: ${{ env.BOOL == 'true' }}
+      with:
+        project: 'https://github.com/orgs/Senzing/projects/2'
diff --git a/.github/workflows/add-to-project-t-comm.yaml → ...orkflows/add-issue-to-project-t-comm.yaml b/.github/workflows/add-to-project-t-comm.yaml → ...orkflows/add-issue-to-project-t-comm.yaml
@@ -1,21 +1,20 @@
 # Based on
 # - https://github.com/srggrs/assign-one-project-github-action
 
-name: Auto Assign issue to project
-
+name: add-issue-to-project-t-comm.yaml
 on:
   issues:
     types:
       - reopened
       - opened
 env:
   GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}
-
 jobs:
   assign_one_project:
+    name: Add issue to Senzing Community project
     runs-on: ubuntu-latest
     steps:
-    - name: Assign issues to project
+    - name: Assign issue to project
       uses: Senzing/github-action-add-issue-to-project@main
       with:
         project: 'https://github.com/orgs/Senzing/projects/2'

diff --git a/.github/workflows/add-triage-label.yaml b/.github/workflows/add-triage-label.yaml
@@ -2,22 +2,18 @@
 # - https://docs.github.com/en/actions/guides/adding-labels-to-issues
 # - https://github.com/andymckay/labeler
 
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Simple Issue Labeler
+name: add-triage-label.yaml
 on:
   issues:
     types:
       - reopened
       - opened
 jobs:
   automate-issues-labels:
+    name: Add triage label to issue
     runs-on: ubuntu-latest
     steps:
       - name: initial labeling
-        uses: andymckay/labeler@1.0.3
+        uses: andymckay/labeler@1.0.4
         with:
           add-labels: "triage"
diff --git a/.github/workflows/identify-customer.yaml b/.github/workflows/identify-customer.yaml
@@ -1,5 +1,4 @@
-name: identify_customer
-
+name: identify-customer.yaml
 on:
   issues:
     types:
@@ -8,28 +7,15 @@ env:
   GITHUB_TOKEN: ${{ secrets.ORG_MEMBERSHIP_TOKEN }}
   MEMBER_LIST: ${{ secrets.SENZING_MEMBERS }}
   CREATOR: ${{ github.actor }}
-  TITLE: ${{ github.event.issue.title }}
-  NUMBER: ${{ github.event.issue.number }}
-  TOKEN: ${{ secrets.SENZING_SLACK_BEARER_TOKEN }}
-  REPO_URL: ${{ github.repository }}
-  SLACK_HASHES: ${{ secrets.SENZING_GITHUB_SLACK_MAP }}
-
 jobs:
-  check-membership:
-    runs-on: ubuntu-latest
-    steps:
-    - name: run script
-      env:
-          BOOL: ${{ contains( env.MEMBER_LIST, env.CREATOR ) }}
-      if: ${{ env.BOOL == 'false' }}
-      uses: Senzing/github-action-identify-customer@main
   automate-issues-labels:
+    name: Add customer-submission label
     runs-on: ubuntu-latest
     steps:
       - name: initial labeling
         env:
           BOOL: ${{ contains( env.MEMBER_LIST, env.CREATOR ) }}
         if: ${{ env.BOOL == 'false' }}
-        uses: andymckay/labeler@1.0.3
+        uses: andymckay/labeler@1.0.4
         with:
           add-labels: "customer-submission"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [markdownlint](https://dlaa.me/markdownlint/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.13.0] - 2023-03-15
+
+### Changed in 1.13.0
+
+- Move from database specific initializers to `senzing/senzing-tools initdatabase`
+
 ## [1.12.1] - 2023-01-16
 
 ### Changed in 1.12.1

diff --git a/resources/mysql/docker-compose-kafka-mysql-api-server.yaml b/resources/mysql/docker-compose-kafka-mysql-api-server.yaml
@@ -4,7 +4,7 @@ services:
   zookeeper:
     container_name: senzing-zookeeper
     environment:
-#     See https://github.com/bitnami/bitnami-docker-zookeeper#configuration
+      # See https://github.com/bitnami/bitnami-docker-zookeeper#configuration
       ALLOW_ANONYMOUS_LOGIN: "yes"
     image: bitnami/zookeeper:${SENZING_DOCKER_IMAGE_VERSION_BITNAMI_ZOOKEEPER:-latest}
     networks:
@@ -18,7 +18,7 @@ services:
     depends_on:
       - zookeeper
     environment:
-#     See https://github.com/bitnami/bitnami-docker-kafka#configuration
+      # See https://github.com/bitnami/bitnami-docker-kafka#configuration
       ALLOW_PLAINTEXT_LISTENER: "yes"
       KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://senzing-kafka:9092"
       KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true"
@@ -36,7 +36,7 @@ services:
     depends_on:
       - kafka
     environment:
-#     See https://github.com/obsidiandynamics/kafdrop#environment-variables
+      # See https://github.com/obsidiandynamics/kafdrop#environment-variables
       JVM_OPTS: "-Xms32M -Xmx64M"
       KAFKA_BROKERCONNECT: "senzing-kafka:9092"
       SERVER_SERVLET_CONTEXTPATH: "/"
@@ -52,7 +52,7 @@ services:
     depends_on:
       - kafka
     environment:
-#     See https://github.com/Senzing/stream-producer#configuration
+      # See https://github.com/Senzing/stream-producer#configuration
       SENZING_DEFAULT_DATA_SOURCE: ${SENZING_DEFAULT_DATA_SOURCE:-TEST}
       SENZING_DELAY_IN_SECONDS: 30
       SENZING_KAFKA_BOOTSTRAP_SERVER: senzing-kafka:9092
@@ -70,7 +70,7 @@ services:
   mysql:
     container_name: senzing-mysql
     environment:
-#     See https://hub.docker.com/_/mysql/ "Environment Variables"
+      # See https://hub.docker.com/_/mysql/ "Environment Variables"
       MYSQL_DATABASE: ${MYSQL_DATABASE:-G2}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD:-g2}
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root}
@@ -81,21 +81,18 @@ services:
     ports:
       - 3306:3306
     restart: always
+    user: "${SENZING_UID:-1001}:0"
     volumes:
       - ${MYSQL_DIR:-/var/lib/mysql}:/var/lib/mysql
 
-  init-mysql:
-    container_name: senzing-init-mysql
+  initdatabase:
+    container_name: senzing-tools-initdatabase
+    command: initdatabase
     depends_on:
       - mysql
     environment:
-      LC_CTYPE: en_US.utf8
-#     See https://github.com/Senzing/init-mysql#configuration
-      SENZING_CONFIGURATION_MODIFICATIONS: |
-        addDataSource CUSTOMERS
-        addDataSource REFERENCE
-        addDataSource WATCHLIST
-      SENZING_ENGINE_CONFIGURATION_JSON: >-
+      SENZING_TOOLS_DATASOURCES: CUSTOMERS REFERENCE WATCHLIST
+      SENZING_TOOLS_ENGINE_CONFIGURATION_JSON: >-
         {
           "PIPELINE": {
             "CONFIGPATH": "/etc/opt/senzing",
@@ -108,8 +105,7 @@ services:
             "CONNECTION": "mysql://${MYSQL_USERNAME:-g2}:${MYSQL_PASSWORD:-g2}@${MYSQL_HOST:-senzing-mysql}:${MYSQL_PORT:-3306}/?schema=${MYSQL_DATABASE:-G2}"
           }
         }
-      SENZING_SUBCOMMAND: mandatory
-    image: senzing/init-mysql:${SENZING_DOCKER_IMAGE_VERSION_INIT_MYSQL:-latest}
+    image: senzing/senzing-tools-mysql:${SENZING_DOCKER_IMAGE_VERSION_SENZING_TOOLS:-latest}
     networks:
       - senzing
     read_only: true
@@ -161,7 +157,7 @@ services:
       - mysql
     environment:
       LC_CTYPE: en_US.utf8
-#     See https://github.com/Senzing/stream-loader#configuration
+      # See https://github.com/Senzing/stream-loader#configuration
       SENZING_DELAY_IN_SECONDS: 60
       SENZING_ENGINE_CONFIGURATION_JSON: >-
         {
@@ -191,7 +187,7 @@ services:
     depends_on:
       - loader
     environment:
-#     See https://github.com/Senzing/redoer#configuration
+      # See https://github.com/Senzing/redoer#configuration
       SENZING_DELAY_IN_SECONDS: 60
       SENZING_ENGINE_CONFIGURATION_JSON: >-
         {
@@ -255,7 +251,7 @@ services:
       - api
       - webapp-console
     environment:
-#     See https://github.com/Senzing/entity-search-web-app#configuration
+      # See https://github.com/Senzing/entity-search-web-app#configuration
       SENZING_API_SERVER_URL: http://senzing-api-server:8250
       SENZING_WEB_SERVER_ADMIN_AUTH_MODE: JWT
       SENZING_WEB_SERVER_ADMIN_AUTH_PATH: http://senzing-webapp:8251

diff --git a/resources/mysql/docker-compose-kafka-mysql.yaml b/resources/mysql/docker-compose-kafka-mysql.yaml
@@ -4,7 +4,7 @@ services:
   zookeeper:
     container_name: senzing-zookeeper
     environment:
-#     See https://github.com/bitnami/bitnami-docker-zookeeper#configuration
+      # See https://github.com/bitnami/bitnami-docker-zookeeper#configuration
       ALLOW_ANONYMOUS_LOGIN: "yes"
     image: bitnami/zookeeper:${SENZING_DOCKER_IMAGE_VERSION_BITNAMI_ZOOKEEPER:-latest}
     networks:
@@ -18,7 +18,7 @@ services:
     depends_on:
       - zookeeper
     environment:
-#     See https://github.com/bitnami/bitnami-docker-kafka#configuration
+      # See https://github.com/bitnami/bitnami-docker-kafka#configuration
       ALLOW_PLAINTEXT_LISTENER: "yes"
       KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://senzing-kafka:9092"
       KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true"
@@ -36,7 +36,7 @@ services:
     depends_on:
       - kafka
     environment:
-#     See https://github.com/obsidiandynamics/kafdrop#environment-variables
+      # See https://github.com/obsidiandynamics/kafdrop#environment-variables
       JVM_OPTS: "-Xms32M -Xmx64M"
       KAFKA_BROKERCONNECT: "senzing-kafka:9092"
       SERVER_SERVLET_CONTEXTPATH: "/"
@@ -52,7 +52,7 @@ services:
     depends_on:
       - kafka
     environment:
-#     See https://github.com/Senzing/stream-producer#configuration
+      # See https://github.com/Senzing/stream-producer#configuration
       SENZING_DEFAULT_DATA_SOURCE: ${SENZING_DEFAULT_DATA_SOURCE:-TEST}
       SENZING_DELAY_IN_SECONDS: 30
       SENZING_KAFKA_BOOTSTRAP_SERVER: senzing-kafka:9092
@@ -70,7 +70,7 @@ services:
   mysql:
     container_name: senzing-mysql
     environment:
-#     See https://hub.docker.com/_/mysql/ "Environment Variables"
+      # See https://hub.docker.com/_/mysql/ "Environment Variables"
       MYSQL_DATABASE: ${MYSQL_DATABASE:-G2}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD:-g2}
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root}
@@ -81,21 +81,18 @@ services:
     ports:
       - 3306:3306
     restart: always
+    user: "${SENZING_UID:-1001}:0"
     volumes:
       - ${MYSQL_DIR:-/var/lib/mysql}:/var/lib/mysql
 
-  init-mysql:
-    container_name: senzing-init-mysql
+  initdatabase:
+    container_name: senzing-tools-initdatabase
+    command: initdatabase
     depends_on:
       - mysql
     environment:
-      LC_CTYPE: en_US.utf8
-#     See https://github.com/Senzing/init-mysql#configuration
-      SENZING_CONFIGURATION_MODIFICATIONS: |
-        addDataSource CUSTOMERS
-        addDataSource REFERENCE
-        addDataSource WATCHLIST
-      SENZING_ENGINE_CONFIGURATION_JSON: >-
+      SENZING_TOOLS_DATASOURCES: CUSTOMERS REFERENCE WATCHLIST
+      SENZING_TOOLS_ENGINE_CONFIGURATION_JSON: >-
         {
           "PIPELINE": {
             "CONFIGPATH": "/etc/opt/senzing",
@@ -108,8 +105,7 @@ services:
             "CONNECTION": "mysql://${MYSQL_USERNAME:-g2}:${MYSQL_PASSWORD:-g2}@${MYSQL_HOST:-senzing-mysql}:${MYSQL_PORT:-3306}/?schema=${MYSQL_DATABASE:-G2}"
           }
         }
-      SENZING_SUBCOMMAND: mandatory
-    image: senzing/init-mysql:${SENZING_DOCKER_IMAGE_VERSION_INIT_MYSQL:-latest}
+    image: senzing/senzing-tools-mysql:${SENZING_DOCKER_IMAGE_VERSION_SENZING_TOOLS:-latest}
     networks:
       - senzing
     read_only: true
@@ -161,7 +157,7 @@ services:
       - mysql
     environment:
       LC_CTYPE: en_US.utf8
-#     See https://github.com/Senzing/stream-loader#configuration
+      # See https://github.com/Senzing/stream-loader#configuration
       SENZING_DELAY_IN_SECONDS: 60
       SENZING_ENGINE_CONFIGURATION_JSON: >-
         {
@@ -191,7 +187,7 @@ services:
     depends_on:
       - loader
     environment:
-#     See https://github.com/Senzing/redoer#configuration
+      # See https://github.com/Senzing/redoer#configuration
       SENZING_DELAY_IN_SECONDS: 60
       SENZING_ENGINE_CONFIGURATION_JSON: >-
         {
@@ -258,7 +254,7 @@ services:
       - pocserver
       - webapp-console
     environment:
-#     See https://github.com/Senzing/entity-search-web-app#configuration
+      # See https://github.com/Senzing/entity-search-web-app#configuration
       SENZING_API_SERVER_URL: http://senzing-poc-server:8250
       SENZING_CONSOLE_SERVER_URL: ws://senzing-webapp-console:8257
       SENZING_WEB_SERVER_ADMIN_AUTH_MODE: NONE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Default code owner

		* @Senzing/senzing-community