From 5d94835d7d56596a1d28fc3b52bee326acc0fde3 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Thu, 27 Jan 2022 11:01:07 +0100 Subject: [PATCH] docker: use platform-specific dockerize build - fixes #43 --- Dockerfile | 11 +++++++++-- backend/start.sh | 4 +++- docker-compose.yml | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index dc85b20..50040cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,8 +43,15 @@ RUN FRONTEND_BUILD_DIR=/frontend /venv/*/bin/python ./manage.py add_version ${BU FROM python:3.7-alpine AS backend -ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /wait -RUN chmod +x /wait +ENV DOCKERIZE_VERSION v0.6.1 +ARG TARGETPLATFORM +RUN if [ "$TARGETPLATFORM" = "arm64" ]; \ + then export DOCKERIZE_ARCH=armhf; \ + else export DOCKERIZE_ARCH=amd64; \ + fi +RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-$DOCKERIZE_ARCH-$DOCKERIZE_VERSION.tar.gz \ + && tar -C /usr/local/bin -xzvf dockerize-linux-$DOCKERIZE_ARCH-$DOCKERIZE_VERSION.tar.gz \ + && rm dockerize-linux-$DOCKERIZE_ARCH-$DOCKERIZE_VERSION.tar.gz RUN apk add mariadb-connector-c diff --git a/backend/start.sh b/backend/start.sh index 7e7f498..de32051 100755 --- a/backend/start.sh +++ b/backend/start.sh @@ -1,5 +1,7 @@ #!/bin/sh -/wait +if [ -z "$var" ]; then + dockerize $DOCKERIZE_ARGS +fi cd /app /venv/*/bin/python ./manage.py migrate /venv/*/bin/gunicorn diff --git a/docker-compose.yml b/docker-compose.yml index 8ba94c4..eff9a86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: - ENABLE_HOMEPAGE=False - DEBUG=False - APP_DIST_STORAGE=file:///app-dist - - WAIT_HOSTS=db:3306 + - DOCKERIZE_ARGS="-wait tcp://db:3306 -timeout 60s" db: image: mariadb:10.7.1