From 6b401513983f6fc0b9f61ade07f32bdd93551ea6 Mon Sep 17 00:00:00 2001
From: Davis Raymond Muro <davis.ray.muro@gmail.com>
Date: Mon, 24 Apr 2023 15:25:15 +0300
Subject: [PATCH] refactor(ci): remove alpine ci build

- We don't necessarily use it anywhere at the moment due to issues with
  the SavReaderWriter package
---
 .github/workflows/ecr-image-build.yml  | 28 ++++----------------------
 docker/onadata-uwsgi/Dockerfile.alpine |  1 +
 docker/onadata-uwsgi/Dockerfile.ubuntu |  2 --
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ecr-image-build.yml b/.github/workflows/ecr-image-build.yml
index a28ca6f8e1..14d1245daf 100644
--- a/.github/workflows/ecr-image-build.yml
+++ b/.github/workflows/ecr-image-build.yml
@@ -10,8 +10,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
+  build-ubuntu:
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -52,7 +52,7 @@ jobs:
         if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
         run: echo "version=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
 
-      - name: (Ubuntu) Build and push
+      - name: Build and push
         id: docker-build-ubuntu
         uses: docker/build-push-action@v2
         with:
@@ -69,29 +69,9 @@ jobs:
           tags: |
             ${{ steps.login-ecr.outputs.registry }}/onaio/onadata:${{ env.version || github.ref_name }}
 
-      - name: (Alpine) Build and push
-        id: docker-build-alpine
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./docker/onadata-uwsgi/Dockerfile.alpine
-          platforms: linux/amd64
-          cache-from: type=registry,ref=${{ steps.login-ecr.outputs.registry }}/onaio/onadata:${{ env.version }}-alpine
-          cache-to: type=inline
-          ssh: |
-            default=/tmp/ssh-agent.sock
-          build-args: |
-            optional_packages=PyYAML django-redis ${{ secrets.ECR_OPTIONAL_PACKAGES }}
-          push: true
-          tags: |
-            ${{ steps.login-ecr.outputs.registry }}/onaio/onadata:${{ env.version || github.ref_name }}-alpine
-
-      - name: (Ubuntu) Image digest
+      - name: Image digest
         run: echo ${{ steps.docker-build-ubuntu.outputs.digest }}
 
-      - name: (Alpine) Image digest
-        run: echo ${{ steps.docker-build-alpine.outputs.digest }}
-
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
diff --git a/docker/onadata-uwsgi/Dockerfile.alpine b/docker/onadata-uwsgi/Dockerfile.alpine
index 9cbee22e52..0e7814a9ae 100644
--- a/docker/onadata-uwsgi/Dockerfile.alpine
+++ b/docker/onadata-uwsgi/Dockerfile.alpine
@@ -1,3 +1,4 @@
+# NOTE: This image currently does not work with the SAV export package
 FROM python:3.9-alpine3.17
 
 ENV PYTHONUNBUFFERED 1
diff --git a/docker/onadata-uwsgi/Dockerfile.ubuntu b/docker/onadata-uwsgi/Dockerfile.ubuntu
index 01cc6eb3a2..b15c651a81 100644
--- a/docker/onadata-uwsgi/Dockerfile.ubuntu
+++ b/docker/onadata-uwsgi/Dockerfile.ubuntu
@@ -39,8 +39,6 @@ RUN apt-get update -q &&\
         libxslt1-dev \
         zlib1g-dev \
         ghostscript \
-        python3-celery \
-        python3-sphinx \
         pkg-config \
         gcc \
         automake \