From 01acaf2edac85f2a9329169159ad610ab1fa66be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Nu=C3=9Fbaum?=
 <55881263+nunico@users.noreply.github.com>
Date: Thu, 20 May 2021 05:21:07 +0200
Subject: [PATCH] Fix container image build (#178)

Fixes djrobstep/migra#177
Use python:3.9-alpine as base to reduce reliance on alpine maintainers
for python and remove already provided packages (python3, python3-dev,
ca-certificates).
Remove bash since there is already a shell provided and the
entrypoint-script is not using bash-exclusive syntax.
Change entrypoint-script's shebang from bash to sh & fix
array-to-string assignment see https://github.com/koalaman/shellcheck/wiki/SC2124
---
 Dockerfile           | 16 +++++++---------
 docker-entrypoint.sh |  5 ++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e0f22d..a29d1af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,10 @@
-FROM alpine:3.8
-
-RUN set -x && \
-    apk add --no-cache bash python3 ca-certificates postgresql-libs postgresql-dev && \
-    apk add --no-cache --virtual=build-dependencies build-base python3-dev && \
-    pip3 install --upgrade --no-cache-dir pip && \
-    pip3 install --no-cache-dir psycopg2-binary migra && \
-    apk del build-dependencies postgresql-dev python3-dev && \
-    rm -rf /tmp/* /var/tmp/* /var/cache/apk/*
+FROM python:3.9-alpine
+
+RUN apk add --update --no-cache --upgrade postgresql-libs && \
+  apk add --no-cache --virtual=build-dependencies build-base postgresql-dev && \
+  pip install --no-cache-dir packaging psycopg2-binary migra && \
+  apk del build-dependencies && \
+  rm -rf /tmp/* /var/tmp/* /var/cache/apk/*
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index a714f13..71b4869 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,11 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 set -e
 
 if [ "$1" = 'migra' ]; then
 	if [ "${MIGRA_LOG_COMMAND}" = 'true' ]; then
-		migra_command="$@"
-		echo "${migra_command}"
+		echo "$*"
 	fi
 fi