From 83226056af1e07c5dfa8f4ce6b11627c7394699c Mon Sep 17 00:00:00 2001
From: Brian Thorne <brian@thorne.link>
Date: Tue, 23 Nov 2021 16:29:11 +1300
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=91=B7=20Update=20base=20alpine=20ver?=
 =?UTF-8?q?sion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/Dockerfile       | 36 +++++++++++++++++-------------------
 base/requirements.txt |  4 ++--
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 844dadd8..6e240ff9 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,12 +1,10 @@
-FROM alpine:3.14.2
+FROM alpine:3.14.3
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
-# Search for current versions at
-# https://pkgs.alpinelinux.org/packages?name=python3&branch=v3.13&arch=x86_64
 # postgresql-dev needed for pg_config
 # c compiler, python-dev, libpq, libpq-dev needed by psycopg2 (https://www.psycopg.org/docs/install.html)
 # libffi-dev needed by anonlink
@@ -17,24 +15,24 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
 WORKDIR /var/www
 ADD requirements.txt /var/www/requirements.txt
 RUN apk add --no-cache \
-    python3=3.9.5-r1 \
-    py3-pip=20.3.4-r1 \
-    libstdc++=10.3.1_git20210424-r2 \
-    mpc1-dev=1.2.1-r0 \
-    yajl=2.1.0-r1 \
-    libpq=13.4-r0 \
-    openssl-dev=1.1.1l-r0 \
-    cargo=1.52.1-r1 && \
+    python3 \
+    py3-pip\
+    libstdc++ \
+    mpc1-dev \
+    yajl \
+    libpq \
+    openssl-dev \
+    cargo && \
     ln -s /usr/bin/python3 /usr/bin/python && \
     apk add --no-cache --virtual .build-deps \
-    g++=10.3.1_git20210424-r2 \
-    python3-dev=3.9.5-r1 \
-    yajl-dev=2.1.0-r1 \
-    postgresql-dev=13.4-r0 \
-    libffi-dev=3.3-r2 \
-    gmp-dev=6.2.1-r0 \
-    mpfr-dev=4.1.0-r0 \
-    wait4ports=0.3.3-r0 \
+    g++ \
+    python3-dev \
+    yajl-dev \
+    postgresql-dev \
+    libffi-dev \
+    gmp-dev \
+    mpfr-dev \
+    wait4ports \
     git && \
     pip install setuptools wheel && \
     python -m pip install --upgrade pip && \
diff --git a/base/requirements.txt b/base/requirements.txt
index e9584ec8..5c38cd36 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,5 +1,5 @@
 jsonschema==3.2.0
-alembic==1.6.5
+alembic==1.7.5
 anonlink==0.14.2
 anonlink-client==0.1.5
 bitarray-hardbyte==1.6.2
@@ -15,7 +15,7 @@ ijson==3.1.4
 iso8601==0.1.16
 jaeger-client==4.8.0
 marshmallow==3.13.0
-minio==7.1.0
+minio==7.1.1
 opentracing==2.4.0
 opentracing_instrumentation==3.3.1
 psycopg2==2.9.1

From d6a1995c7ee6a18b92bcd6d195a18acded62e2d9 Mon Sep 17 00:00:00 2001
From: Brian Thorne <brian@thorne.link>
Date: Mon, 29 Nov 2021 09:51:45 +1300
Subject: [PATCH 2/2] Debugging azure deployment

---
 azure-pipelines.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e2bbfde7..763b3f5f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -272,6 +272,43 @@ stages:
         inputs:
           helmVersionToInstall: 'latest'
 
+      # Show what is installed in the test namespace in-case a cleanup has failed
+      - task: Kubernetes@1
+        displayName: 'List Installed Deployments'
+        name: listdeployments
+        inputs:
+          connectionType: 'Kubernetes Service Connection'
+          kubernetesServiceEndpoint: $(CLUSTER)
+          command: 'get'
+          arguments: '--namespace $(NAMESPACE) deployment'
+
+      - task: Kubernetes@1
+        displayName: 'List Installed Jobs'
+        name: listjobs
+        inputs:
+          connectionType: 'Kubernetes Service Connection'
+          kubernetesServiceEndpoint: $(CLUSTER)
+          command: 'get'
+          arguments: '--namespace $(NAMESPACE) jobs'
+
+      - task: Kubernetes@1
+        displayName: 'List Installed Volumes'
+        name: listvols
+        inputs:
+          connectionType: 'Kubernetes Service Connection'
+          kubernetesServiceEndpoint: $(CLUSTER)
+          command: 'get'
+          arguments: '--namespace $(NAMESPACE) pvc,pv'
+
+      - task: Kubernetes@1
+        displayName: 'List Installed statefulsets'
+        name: liststatefulsets
+        inputs:
+          connectionType: 'Kubernetes Service Connection'
+          kubernetesServiceEndpoint: $(CLUSTER)
+          command: 'get'
+          arguments: '--namespace $(NAMESPACE) statefulsets'
+
       - task: HelmDeploy@0
         displayName: Helm package
         inputs: