Merge branch 'master' into improved-script-compatability

Author: OskarLiew

.github/workflows/ci_checks.yml

@@ -0,0 +1,21 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  test-python38:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: "Install s2i"
+        run: |
+          wget -c https://github.com/openshift/source-to-image/releases/download/v1.3.0/source-to-image-v1.3.0-eed2850f-linux-amd64.tar.gz -O - | tar -xz
+          sudo cp s2i /usr/local/bin
+      - name: Run the test script
+        run: make test -C python38-slim/

.github/workflows/docker_image_release.yml

@@ -0,0 +1,25 @@
+name: Release docker image
+
+on:
+  release:
+    types: [published]
+
+jobs:
+
+  build:
+    name: Build and run daeploy Manager
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DAEPLOY_DOCKER_USERNAME }}
+        password: ${{ secrets.DAEPLOY_DOCKER_PASSWORD }}
+
+    - name: Docker build and push
+      run: |
+        docker build -t daeploy/s2i-python:3.8-slim-${{ github.event.release.tag_name }} -t daeploy/s2i-python:latest ./python38-slim
+        docker push --all-tags daeploy/s2i-python

python38-slim/test/run

@@ -32,7 +32,7 @@ cid_file=$($MKTEMP_EXEC -u)
 s2i_args="--pull-policy=never --loglevel=2"
 
 # Port the image exposes service to be tested
-test_port=8080
+test_port=8000
 
 image_exists() {
   docker inspect $1 &>/dev/null
@@ -110,15 +110,29 @@ test_usage() {
   s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
 }
 
+http_call() {
+  local url="$1"
+  curl -X 'POST' \
+    "$url" \
+    -w %{http_code} \
+    -s \
+    -o /dev/null \
+    -H 'accept: application/json' \
+    -H 'Content-Type: application/json' \
+    -d '{
+    "name": "Snorre Sturlasson"
+    }'
+}
+
 test_connection() {
   echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
   local max_attempts=10
   local sleep_time=1
   local attempt=1
   local result=1
   while [ $attempt -le $max_attempts ]; do
-    echo "Sending GET request to http://$(container_ip):$(container_port)/"
-    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
+    echo "Sending POST request http://$(container_ip):$(container_port)/hello"
+    response_code=$(http_call http://$(container_ip):$(container_port)/hello)
     status=$?
     if [ $status -eq 0 ]; then
       if [ $response_code -eq 200 ]; then
@@ -152,3 +166,4 @@ test_connection
 check_result $?
 
 cleanup
+echo "Test successful"