From 58601202333795dbda297d2ca90f47e926aa6023 Mon Sep 17 00:00:00 2001 From: Alexey Zhokhov Date: Sun, 5 Aug 2018 22:13:12 +0800 Subject: [PATCH] Improved Docker container. --- Dockerfile | 12 +++++++----- build-docker.sh | 14 ++++++++++++++ docker-entrypoint.sh | 10 ++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100755 build-docker.sh create mode 100755 docker-entrypoint.sh diff --git a/Dockerfile b/Dockerfile index 126af27..5e0f22d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,15 @@ -FROM alpine:3.7 +FROM alpine:3.8 -RUN apk add --no-cache python3 ca-certificates postgresql-dev && \ +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 && \ + apk del build-dependencies postgresql-dev python3-dev && \ rm -rf /tmp/* /var/tmp/* /var/cache/apk/* -ENTRYPOINT [ "/usr/bin/migra" ] +COPY docker-entrypoint.sh /docker-entrypoint.sh -CMD ["--help"] +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD ["migra", "--help"] diff --git a/build-docker.sh b/build-docker.sh new file mode 100755 index 0000000..ba44ced --- /dev/null +++ b/build-docker.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +printf "\n> \e[93m\033[1mBuilding Docker image\e[0m\n\n" + +set -e + +ABSOLUTE_PATH=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd) +cd ${ABSOLUTE_PATH} + +DOCKER_IMAGE="djrobstep/migra:latest" + +printf "# Image: \e[1;37m${DOCKER_IMAGE}\e[0m\n\n" + +docker build -t djrobstep/migra:latest . diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100755 index 0000000..391c0ce --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e + +if [ "$1" = 'migra' ]; then + migra_command="$@" + echo "${migra_command}" +fi + +exec "$@"