From c0fab4aef3758cb054f10d4a06b4fa7d1650e130 Mon Sep 17 00:00:00 2001
From: Stephan Porada <sporada@uni-bielefeld.de>
Date: Wed, 23 Oct 2019 14:42:23 +0200
Subject: [PATCH] Add bash ti image
---
Dockerfile | 1 +
docker-compose.yml | 1 +
docker-entrypoint.sh | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ff76ebb2..01208183 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ ENV FLASK_APP=opaque.py
RUN apk add \
+ bash \
build-base \
git \
postgresql-dev
diff --git a/docker-compose.yml b/docker-compose.yml
index c71e39a5..a25d76bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,7 @@ services:
- ../opaque_daemon/opaque_daemon.py:/home/opaque_daemon/opaque_daemon.py
- $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json
- ../opaque_daemon/config.ini:/home/opaque_daemon/config.ini
+ - ./docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
db:
deploy:
placement:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 85e1acfe..af075777 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-/wait-for-it/wait-for-it.sh db:5432 --strict --timeout=0
+./wait-for-it/wait-for-it.sh db:5432 --strict --timeout=0
if [ $# -eq 0 ]
then
venv/bin/python -u opaque.py
--
GitLab