Skip to content

Commit

Permalink
*Ubuntu 19.10 is End of life - and so our tests are failing as the UR…
Browse files Browse the repository at this point in the history
…Ls for apt have changed to old release

*Some times anyway server is starting before the DB dump is finish loading
*Change from sh to bash, as sh don't support pushd
  • Loading branch information
BarVolunteering committed Dec 10, 2020
1 parent 1165a77 commit 71c7879
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ubuntu:19.10 AS builder
FROM ubuntu:20.04 AS builder

# Install system tools
RUN apt-get clean && \
apt-get -y update && \
apt-get install -y \
python3.7-dev \
python3-dev \
build-essential \
libpq-dev \
virtualenv && \
Expand All @@ -24,7 +24,7 @@ RUN . /venv3/bin/activate && \
RUN find /venv3 -name '*.so' | xargs strip


FROM ubuntu:19.10 AS runtime
FROM ubuntu:20.04 AS runtime

RUN apt-get clean && \
apt-get -y update && \
Expand Down
2 changes: 1 addition & 1 deletion db_docker/restore_db.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

set -e

Expand Down
4 changes: 2 additions & 2 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash

RETRIES=20
RETRIES=40

until psql $DATABASE_URL -c "select 1" > /dev/null 2>&1 || [ $RETRIES -eq 0 ]; do
echo "Waiting for postgres server, $((RETRIES--)) remaining attempts..."
sleep 10
sleep 20
done

if [ "${ALLOW_ALEMBIC_UPGRADE}" == "yes" ]; then
Expand Down

0 comments on commit 71c7879

Please sign in to comment.