fix: Workflow updated and apk packages constraints adjusted (#13)

* Updated entrypoint and logic inside it to print non-json output as well (login and json params)
* Anchor testing removed because creates too much false negative results
* Functional test added

Author: DovnarAlexander

.github/workflows/CI.yaml

@@ -14,7 +14,7 @@ jobs:
     name: Lint Code Base
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
+      - name: Checkout Code (Lint)
         uses: actions/checkout@v2
       - name: Lint Code Base
         uses: github/super-linter@v3
@@ -26,9 +26,26 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       tag: ${{ steps.info.outputs.tag }}
+      repo: ${{ steps.info.outputs.repo }}
     steps:
-      - name: Checkout Code
+      # Preparation
+      - name: Checkout Code (Testing)
         uses: actions/checkout@v2
+      - name: Set up QEMU  (Testing)
+        uses: docker/setup-qemu-action@v1
+      - name: Login to DockerHub (Testing)
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      # Test
+      - name: Test help command
+        uses: ./
+        with:
+          login: false
+          json: false
+          task: help
+      # Info gathering
       - id: info
         run: |
           repo=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
@@ -44,72 +61,61 @@ jobs:
           tag=$tag
           echo "::set-output name=repo::$repo"
           echo "::set-output name=tag::$tag"
-      - name: Build and Push to GitHub registry Commit tag
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: docker.pkg.github.com/${{ github.repository }}/jelastic-cli
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.G_TOKEN }}
-          registry: docker.pkg.github.com
-          tags: "${{ steps.info.outputs.tag }}"
-      - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v1
+      # Build
+      - name: Build and Push image (Testing)
+        uses: docker/build-push-action@v2
         with:
-          registry: docker.pkg.github.com
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.G_TOKEN }}
-      - name: Anchore scan
-        uses: anchore/scan-action@v2
-        with:
-          image: "docker.pkg.github.com/${{ steps.info.outputs.repo }}/jelastic-cli:${{ steps.info.outputs.tag }}"
-          fail-build: true
-          acs-report-enable: true
-          severity-cutoff: high
-      - name: upload Anchore scan SARIF report
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif
+          push: true
+          tags: aliaksandrdounar/jelastic-cli:latest
 
-  docker:
+  build:
     name: Build and Public Docker image
     runs-on: ubuntu-latest
     needs: [lint, test]
     steps:
-      - name: Checkout Code
+      # Prepare
+      - name: Checkout Code (Build)
         uses: actions/checkout@v2
+      - name: Set up QEMU (Build)
+        uses: docker/setup-qemu-action@v1
+      - name: Login to docker.pkg.github.com (Build)
+        uses: docker/login-action@v1 
+        with:
+          registry: docker.pkg.github.com
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.G_TOKEN }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Dry-run tag generation
         id: create_tag_test
         uses: anothrNick/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
           DRY_RUN: true
-      - name: Build and Push to GitHub registry
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: docker.pkg.github.com/${{ github.repository }}/jelastic-cli
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.G_TOKEN }}
-          registry: docker.pkg.github.com
-          tags: "${{ needs.test.outputs.tag }},${{ steps.create_tag_test.outputs.new_tag }},latest"
-      - name: Build and Push to DockerHub
-        uses: elgohr/Publish-Docker-Github-Action@master
+      # Build 
+      - name: Build and Push image
+        uses: docker/build-push-action@v2
         with:
-          name: aliaksandrdounar/jelastic-cli
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "${{ needs.test.outputs.tag }},${{ steps.create_tag_test.outputs.new_tag }},latest"
-
+          push: true
+          tags: >
+            docker.pkg.github.com/${{ needs.test.outputs.repo }}/jelastic-cli:${{ needs.test.outputs.tag }},
+            docker.pkg.github.com/${{ needs.test.outputs.repo }}/jelastic-cli:${{ steps.create_tag_test.outputs.new_tag }},
+            docker.pkg.github.com/${{ needs.test.outputs.repo }}/jelastic-cli:latest,
+            aliaksandrdounar/jelastic-cli:${{ needs.test.outputs.tag }},
+            aliaksandrdounar/jelastic-cli:${{ steps.create_tag_test.outputs.new_tag }},
+            aliaksandrdounar/jelastic-cli:latest
   release:
     name: Create Release
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    needs: docker
+    needs: build
     steps:
-      - name: Checkout code
+      - name: Checkout Code (Release)
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
       - name: Changelog generation
         uses: heinrichreimer/[email protected]
         id: changelog

Dockerfile

@@ -1,8 +1,8 @@
-FROM openjdk:17-alpine3.12
+FROM openjdk:16-alpine3.13
 # Labels
 LABEL maintainer="[email protected]"
 # Install Bash, cURL and clean up APK
-RUN apk add --no-cache curl==7.69.1-r3 bash==5.0.17-r0 jq==1.6-r1 && \
+RUN apk add --no-cache curl=~7.76 bash=~5.1 jq=~1.6 && \
     rm -vrf /var/cache/apk/*
 # Create User and Group
 ENV USER=docker

README.md

@@ -24,6 +24,15 @@ Result JSON document returned from Jelastic.
       task: environment/control/getenvs
 ```
 ## Local usage
+### Information
+Docker's entrypoint expects 3+ arguments specified.
+```bash
+docker run --rm --env JELASTIC_URL --env JELASTIC_USERNAME --env JELASTIC_PASSWORD aliaksandrdounar/jelastic-cli:latest true true environment/control/getenvs
+```
+Where:
+- `true` - login to Jelastic Cloud
+- `true` - print json output (instead of raw from the API)
+- `environment/control/getenvs` - command
 ### Preparation
 ```bash
 export JELASTIC_URL=<jelastic_api_fqnd>
@@ -32,10 +41,10 @@ export JELASTIC_PASSWORD=<your_password>
 ```
 ### Use from DockerHub
 ```bash
-docker run --rm --env JELASTIC_URL --env JELASTIC_USERNAME --env JELASTIC_PASSWORD aliaksandrdounar/jelastic-cli:latest environment/control/getenvs
+docker run --rm --env JELASTIC_URL --env JELASTIC_USERNAME --env JELASTIC_PASSWORD aliaksandrdounar/jelastic-cli:latest true true environment/control/getenvs
 ```
 ### Use from GitHub
 ```bash
 echo TOKEN | docker login https://docker.pkg.github.com -u USERNAME --password-stdin
-docker run --rm --env JELASTIC_URL --env JELASTIC_USERNAME --env JELASTIC_PASSWORD docker.pkg.github.com/dovnaralexander/jelastic-docker-image/jelastic-cli:latest environment/control/getenvs
+docker run --rm --env JELASTIC_URL --env JELASTIC_USERNAME --env JELASTIC_PASSWORD docker.pkg.github.com/dovnaralexander/jelastic-docker-image/jelastic-cli:latest true true environment/control/getenvs
 ```

action.yaml

@@ -16,6 +16,14 @@ inputs:
   jelastic_password:
     description: 'Jelastic Password or API Token.'
     required: true
+  login:
+    description: 'Do you want to login first'
+    required: false
+    default: "true"
+  json:
+    description: 'Do you want to print jsoned output instead of raw.'
+    required: false
+    default: "true"
   task:
     description: 'Task to execute.'
     required: true
@@ -31,4 +39,6 @@ runs:
     JELASTIC_USERNAME: ${{ inputs.jelastic_username }}
     JELASTIC_PASSWORD: ${{ inputs.jelastic_password }}
   args:
+    - ${{ inputs.login }}
+    - ${{ inputs.json }}
     - ${{ inputs.task }}

entrypoint-github.sh

@@ -6,5 +6,5 @@ export HOME=/cli  # To overwrite GitHub run command
 
 cd $HOME
 IFS=" " read -r -a args <<< "$@"
-response=$(/cli/entrypoint.sh "${args[@]}" | jq --compact-output)
+response=$(/cli/entrypoint.sh "${args[@]}")
 echo "::set-output name=output::$response"

entrypoint.sh

@@ -2,7 +2,20 @@
 
 set -e
 
-response=$(echo n | /cli/jelastic/users/authentication/signin --login "$JELASTIC_USERNAME" --password "$JELASTIC_PASSWORD" --platformUrl "$JELASTIC_URL" > /dev/null
-/cli/jelastic/"$1" "${@:2}" | sed '/./{H;$!d} ; x ; s/^[^{]*//g' | sed '/./{H;$!d} ; x ; s/[^}]*$//g' | jq
-)
+login=$1
+json=$2
+command=$3
+home="/cli/jelastic"
+
+if [ "$login" == "true" ]
+then
+  echo n | $home/users/authentication/signin --login "$JELASTIC_USERNAME" --password "$JELASTIC_PASSWORD" --platformUrl "$JELASTIC_URL" > /dev/null
+fi
+response=$("$home/$command" "${@:3}")
+
+if [ "$json" == "true" ]
+then
+  response=$(echo "$response" | sed -n '1!p' | jq --compact-output || echo "$response")
+fi
+
 echo "$response"