Add initial support for ARM based containers (AO-20418) (#39)

Co-authored-by: dominik.maslyk <[email protected]>

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 LABEL authors='SolarWinds AppOptics team <[email protected]>'
 
@@ -7,21 +7,27 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG swisnap_repo=swisnap
 
 RUN apt-get update && \
-    apt-get -y install software-properties-common && \
-    LC_ALL=C.UTF-8 add-apt-repository -y ppa:rmescandon/yq && \
-    apt-get update && \
-    apt-get -y upgrade && \
+    apt-get upgrade -y && \
     apt-get -y install \
       apt-transport-https \
       ca-certificates \
-      docker.io \
       curl \
-      yq && \ 
+      docker.io \
+      gnupg && \
       apt-get clean && \
       rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN arch="$(uname -m)" && if [ "${arch}" = "aarch64" ]; then \
+      yq_arch=arm64; \
+    elif [ "${arch}" = "x86_64" ]; then \
+      yq_arch=amd64; \ 
+    fi && \ 
+    curl -L "https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_${yq_arch}" -o yq && \
+    mv yq /usr/bin/yq && \
+    chmod +x /usr/bin/yq
+
 ARG swisnap_version
-RUN echo "deb https://packagecloud.io/solarwinds/${swisnap_repo}/ubuntu/ bionic main" > /etc/apt/sources.list.d/swisnap.list && \
+RUN echo "deb https://packagecloud.io/solarwinds/${swisnap_repo}/ubuntu/ focal main" > /etc/apt/sources.list.d/swisnap.list && \
   curl -L https://packagecloud.io/solarwinds/${swisnap_repo}/gpgkey | apt-key add - && \
   apt-get update && \
   apt-get -y install solarwinds-snap-agent=${swisnap_version} && \

README.md

@@ -13,7 +13,7 @@ Docker and Kubernetes assets for running SolarWinds Snap Agent
     * [Enabling Docker Logs collector from Kubernetes nodes](#enabling-docker-logs-collector-from-kubernetes-nodes)
     * [Custom plugins configuration and tasks manifests](#custom-plugins-configuration-and-tasks-manifests)
     * [Environment Parameters](#environment-parameters)
-  * [Integrating Kubernetes Cluster Events Collection With Loggly](#integrating-kubernetes-cluster-events-collection-with-loggly)
+  * [Integrating Kubernetes Cluster Events Collection With Loggly](#integrating-kubernetes-cluster-events-collection-with-logglypapertrail)
   * [Dashboard](#dashboard)
   * [Development](#development)
 

deploy/overlays/stable/daemonset/kustomization.yaml

@@ -16,5 +16,4 @@ configMapGenerator:
 
 images:
   - name: solarwinds/solarwinds-snap-agent-docker
-    newTag: 4.3.1-4.3.0.1156
-
+    newTag: 4.4.0-4.3.0.1156

deploy/overlays/stable/deployment/kustomization.yaml

@@ -15,4 +15,4 @@ configMapGenerator:
 
 images:
   - name: solarwinds/solarwinds-snap-agent-docker
-    newTag: 4.3.1-4.3.0.1156
+    newTag: 4.4.0-4.3.0.1156

deploy/overlays/stable/events-collector/kustomization.yaml

@@ -7,4 +7,4 @@ bases:
 
 images:
   - name: solarwinds/solarwinds-snap-agent-docker
-    newTag: 4.3.1-4.3.0.1156
+    newTag: 4.4.0-4.3.0.1156

versions.env

@@ -1,2 +1,2 @@
 export SWISNAP_VERSION=4.3.0.1156
-export DOCKERFILE_VERSION=4.3.1
+export DOCKERFILE_VERSION=4.4.0