Skip to content

Commit 998fddf

Browse files
authored
Merge pull request #104 from SilverLineFramework/docker_entrypoint
Docker entrypoint
2 parents dcd39ce + 964d7b7 commit 998fddf

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ WORKDIR /usr/src/app
55
COPY . .
66

77
RUN pip install --no-cache-dir -r requirements.txt
8-
RUN git clone https://github.com/SilverLineFramework/libsilverline.git
9-
#COPY libsilverline/requirements.txt ./
8+
RUN git clone https://github.com/SilverLineFramework/libsilverline.git || true # dont error out when libsilverline folder exists
109
WORKDIR /usr/src/app/libsilverline
1110
RUN pip install --no-cache-dir -r requirements.txt
1211

@@ -15,5 +14,5 @@ WORKDIR /usr/src/app
1514
RUN chmod +x wait-for-it.sh
1615
RUN chmod +x docker-entrypoint.sh
1716

18-
ENTRYPOINT ["./docker-entrypoint.sh"]
17+
#ENTRYPOINT ["./docker-entrypoint.sh"]
1918
CMD python manage.py runserver 0.0.0.0:8000

docker-entrypoint.sh

100755100644
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ do
2828
fi
2929
done
3030

31+
port=$(grep '"http_port"' $config_file | cut -d':' -f2 | sed 's/[^0-9]*//g')
32+
echo "Starting on port "${port:-8000}
3133
make migrate
32-
python manage.py runserver 0.0.0.0:8000
34+
python manage.py runserver 0.0.0.0:${port:-8000}

0 commit comments

Comments
 (0)