fixup cleanup

.github/actions/skupper-integration-tests/action.yml

@@ -17,9 +17,6 @@
 # under the License.
 #
 
-# waits:
-# first wait to have at least one of a type, then wait for all to be in a state; if waiting for state with empty set, kubectl fails
-
 name: Test skupper-router main
 description: Execute skupper integration testing
 
@@ -38,26 +35,13 @@ runs:
   using: "composite"
   steps:
 
-# As of version 18.03, you can use host.docker.internal as the host's IP.
-
-#      - name: push image
-#        run: sudo microk8s ctr k8s.io image import myimage.tgz
-
-# Use currently built image
-# also consider https://github.com/google/go-containerregistry/blob/main/cmd/crane/doc/crane.md but likely overkill
-# $ docker save hello-web > hello-web.tar
-# sudo microk8s.ctr -n k8s.io image import hello-web.tar
-# sudo microk8s.ctr -n k8s.io images ls --name~=hello-web
-# sudo docker build . -t localhost:32000/hello-web:v3
-
       - name: Get Go cache paths
         id: go-cache-paths
         run: |
           echo "::set-output name=go-build::$(go env GOCACHE)"
           echo "::set-output name=go-mod::$(go env GOMODCACHE)"
         shell: bash
 
-      # https://microk8s.io/docs/addon-metallb
       - name: Install microk8s
         run: |
           sudo snap install microk8s --classic --channel=1.21/stable
@@ -110,7 +94,6 @@ runs:
         working-directory: skupper
         shell: bash
 
-      # https://github.com/canonical/microk8s/issues/1660
       - name: Dump microk8s log (apiserver)
         if: "${{ always() }}"
         run: |

.github/scripts/Dockerfile

@@ -17,8 +17,44 @@
 # under the License.
 #
 
+FROM registry.access.redhat.com/ubi8/ubi:latest as builder
+
+RUN dnf -y --setopt=tsflags=nodocs install \
+      http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-8-4.el8.noarch.rpm \
+      http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-8-4.el8.noarch.rpm \
+ && dnf -y --setopt=tsflags=nodocs install epel-release \
+ && dnf config-manager --set-enabled powertools \
+ && dnf clean all
+
+RUN dnf -y --setopt=tsflags=nodocs install gcc gcc-c++ make cmake cyrus-sasl-devel openssl-devel libuuid-devel swig wget patch findutils git valgrind libwebsockets-devel python3-devel libnghttp2-devel && dnf clean all -y
+WORKDIR /build
+COPY . .
+ENV PROTON_VERSION=0.36.0
+ENV PROTON_SOURCE_URL=${PROTON_SOURCE_URL:-http://archive.apache.org/dist/qpid/proton/${PROTON_VERSION}/qpid-proton-${PROTON_VERSION}.tar.gz}
+RUN .github/scripts/compile.sh
+
+
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
+RUN dnf -y --setopt=tsflags=nodocs update \
+ && dnf -y --setopt=tsflags=nodocs install \
+      http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-8-4.el8.noarch.rpm \
+      http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-8-4.el8.noarch.rpm \
+ && dnf -y --setopt=tsflags=nodocs install epel-release \
+ && dnf config-manager --set-enabled powertools \
+ && dnf clean all
+
+# gdb and valgrind are part of final image as they can be used as debug options for Skupper
+RUN dnf -y --setopt=tsflags=nodocs install glibc cyrus-sasl-lib cyrus-sasl-plain cyrus-sasl-gssapi libuuid openssl gettext hostname iputils python3 libwebsockets libnghttp2 gdb valgrind && dnf clean all
+
+WORKDIR /
+COPY --from=builder /qpid-proton-image.tar.gz /skupper-router-image.tar.gz /
+RUN tar zxpf qpid-proton-image.tar.gz && tar zxpf skupper-router-image.tar.gz && rm -f /qpid-proton-image.tar.gz /skupper-router-image.tar.gz
+
+WORKDIR /home/qdrouterd/etc
+WORKDIR /home/qdrouterd/bin
+COPY ./scripts/* /home/qdrouterd/bin/
+
 ARG version=latest
 ENV VERSION=${version}
 ENV QDROUTERD_HOME=/home/qdrouterd