ITADMIN-2378 - Remove netcat and use simple python solution

Author: Henrik Adamski

.github/workflows/nightly.yml

@@ -1,26 +1,26 @@
 name: nightly
- 
+
 on:
   schedule:
-    - cron: 0 0 * * *
- 
+    - cron: 0 0 * * 1
+
 jobs:
   nightly:
     timeout-minutes: 30
     runs-on: ubuntu-latest
- 
+
     steps:
       - name: checkout
-        uses: actions/checkout@v1
- 
+        uses: actions/checkout@v2
+
       - name: get-project-version
         id: get_project_version
         uses: avides/actions-project-version-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           file-to-check: version.txt
           only-return-version: true
- 
+
       - name: build-image
         env:
           PROJECT_VERSION: ${{ steps.get_project_version.outputs.version }}

.github/workflows/release.yml

@@ -1,29 +1,29 @@
 name: release
- 
+
 on:
   push:
     branches:
-      - master
- 
+      - ITADMIN-2378
+
 jobs:
   release:
     timeout-minutes: 30
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     runs-on: ubuntu-latest
- 
+
     steps:
       - name: checkout
-        uses: actions/checkout@v1
- 
+        uses: actions/checkout@v2
+
       - name: get-project-version
         id: get_project_version
         uses: avides/actions-project-version-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           file-to-check: version.txt
           only-return-version: true
- 
+
       - name: push-image
         env:
           PROJECT_VERSION: ${{ steps.get_project_version.outputs.version }}
@@ -34,3 +34,23 @@ jobs:
           if [[ "$PROJECT_VERSION" != *"SNAPSHOT"* || "$PROJECT_VERSION" != *"RC"* ]]; then
             docker push ${{ secrets.DOCKER_REGISTRY }}/${GITHUB_REPOSITORY}:latest
           fi
+
+      - name: setup-github-release
+        id: setup_github_release
+        env:
+          PROJECT_VERSION: ${{ steps.get_project_version.outputs.version }}
+        run: |
+          echo ::set-output name=gitcommitmessage::$(git log --no-merges -1 --oneline)
+          if [[ "$PROJECT_VERSION" == *"SNAPSHOT"* || "$PROJECT_VERSION" == *"RC"* ]]; then
+            echo ::set-output name=isprerelease::true
+          fi
+
+      - name: github-release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GPR_TOKEN }}
+        with:
+          tag_name: ${{ steps.get_project_version.outputs.version }}
+          release_name: ${{ steps.get_project_version.outputs.version }}
+          body: ${{ steps.setup_github_release.outputs.gitcommitmessage }}
+          prerelease: ${{ steps.setup_github_release.outputs.isprerelease }}

.github/workflows/review.yml

@@ -1,26 +1,52 @@
 name: review
- 
+
 on:
   pull_request:
     types: [opened, synchronize]
- 
+
 jobs:
   review:
     timeout-minutes: 30
     runs-on: ubuntu-latest
- 
+
     steps:
       - name: checkout
-        uses: actions/checkout@v1
- 
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.GPR_TOKEN }}
+          fetch-depth: ''
+
+      - name: post-checkout
+        run: git fetch --prune --unshallow
+
+      - name: action-configuration-autoupdate
+        id: actions_action_configuration_autoupdate
+        uses: avides/actions-action-configuration-autoupdate@v1
+        with:
+          token: ${{ secrets.GPR_TOKEN }}
+          actions-configuration-files: plain-docker-application/nightly.yml,plain-docker-application/release.yml,plain-docker-application/review.yml
+          source-repository: ${{ secrets.ACTIONS_CONFIG_AUTOUPDATE_REPO }}
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          file_pattern: .github/workflows/*.yml
+          commit_user_name: ${{ secrets.ACTIONS_CONFIG_AUTOUPDATE_USER }}
+          commit_user_email: ${{ secrets.ACTIONS_CONFIG_AUTOUPDATE_EMAIL }}
+          commit_author: ${{ secrets.ACTIONS_CONFIG_AUTOUPDATE_AUTHOR }}
+          commit_message: Update GitHub Action configuration
+
+      - name: action-configuration-updated
+        if: ${{ steps.actions_action_configuration_autoupdate.outputs.updated }}
+        run: exit 1;
+
       - name: project-version-check
         id: project_version_check
         uses: avides/actions-project-version-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           file-to-check: version.txt
-          additional-files-to-check: README.md
- 
+
       - name: build-image
         env:
           PROJECT_VERSION: ${{ steps.project_version_check.outputs.version }}

Dockerfile

@@ -4,11 +4,11 @@ FROM ubuntu:18.04
 ## Defaults
 WORKDIR /root/
 
-## Install AWSCli & MySQL
-RUN apt-get update && apt-get install -y python python-pip mysql-client-5.7 && pip install awscli
+## Install Python 3, AWSCli, MySQL and Python simple HTTP Server
+RUN apt update && apt install -y python3 python3-pip mysql-client-5.7 && pip3 install awscli && pip3 install simple_http_server
 
-## Install netcat
-RUN apt-get install -y netcat
+## Setup HTTP Server
+COPY webserver.py /root/webserver.py
 
 ## Configure Crontab
 RUN apt-get install cron

README.md

@@ -28,7 +28,7 @@ docker run \
 --env MYSQL_BACKUP_USER="root" \
 --env MYSQL_BACKUP_PASS="MYSQL_BACKUP_PASS" \
 -p 9300:9300 \
-avides/mysql-s3-backup:2.5.3
+avides/mysql-s3-backup:2.6.0-SNAPSHOT
 ```
 
 ### Build & Test
@@ -46,7 +46,7 @@ docker run \
 --env S3_ACCESS_KEY="AWS_ACCESS_KEY" \
 --env S3_SECRET_KEY="AWS_SECRET_KEY" \
 --env S3_REGION="AWS_REGION" \
---env MYSQL_HOST_ALIAS="MYSQL_HOST_ALIAS (default: ${MYSQL_HOST}" \
+--env MYSQL_HOST_ALIAS="MYSQL_HOST_ALIAS (default: ${MYSQL_HOST})" \
 --env MYSQL_HOST="MYSQL_HOST" \
 --env MYSQL_PORT="MYSQL_PORT (default: 3306)" \
 --env MYSQL_BACKUP_USER="root" \

entrypoint.sh

@@ -3,8 +3,8 @@ printenv | grep -E 'PATH|S3_BUCKET_NAME|S3_ACCESS_KEY|S3_SECRET_KEY|S3_REGION|MY
 sed -i -e "s/CRON_EXPR/${CRON_EXPR}/g" /etc/cron.d/backup-cron
 
 ## Start metrics endpoint
-mkdir /var/log/netcat
-while true; do { printf 'HTTP/1.0 200 OK\r\nContent-Length: %d\r\n\r\n' "$(wc -c < /root/metrics.txt)"; cat /root/metrics.txt; } | nc -l -p 9300 >> /var/log/netcat/netcat.log; done &
+mkdir /var/log/webserver
+python3 /root/webserver.py > /var/log/webserver/webserver.log &
 
 ## Starting
 cron && touch /var/log/backup-cron/cron.log && tail -f /var/log/backup-cron/cron.log

version.txt

@@ -1 +1 @@
-2.5.3
+2.6.0-SNAPSHOT

webserver.py

@@ -0,0 +1,15 @@
+import simple_http_server.server as server
+
+from simple_http_server import request_map
+from pathlib import Path
+
+@request_map("/metrics")
+def metrics():
+    return Path('/root/metrics.txt').read_text()
+
+def main(*args):
+    print("Server starting...")
+    server.start(port=9300)
+    print("Server started!")
+
+main()