Fix docker building

docker/bot.dockerfile → Dockerfile

@@ -6,10 +6,10 @@ WORKDIR /app
 COPY ./pyproject.toml ./poetry.lock* /app/
 RUN poetry install --no-interaction --no-ansi --no-root --without dev
 
-COPY ./docker/pre-start.sh ./docker/start.sh /app/
-RUN chmod +x /app/start.sh /app/pre-start.sh
+ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /
+COPY /start.sh /app/
+RUN chmod +x /app/start.sh /wait-for-it.sh
 
 COPY ./inclusive_dance_bot /app/inclusive_dance_bot
 
 ENV PYTHONPATH=/app
-CMD ["/app/start.sh"]

docker-compose.yaml

@@ -20,13 +20,15 @@ services:
   bot:
     image: andytakker/inclusive_dance_bot:latest
     restart: unless-stopped
+    command: /wait-for-it.sh -t 15 -h db -p 5432 -- /app/start.sh
     environment:
       POSTGRES_HOST: db
       POSTGRES_PORT: 5432
       POSTGRES_USER: $POSTGRES_USER
       POSTGRES_PASSWORD: $POSTGRES_PASSWORD
       POSTGRES_DB: $POSTGRES_DB
-      POSTGRES_URL: postgresql+asyncpg://$POSTGRES_USER:$POSTGRES_PASSWORD@db:5432/$POSTGRES_DB
+
+      PG_URL: postgresql+asyncpg://$POSTGRES_USER:$POSTGRES_PASSWORD@db:5432/$POSTGRES_DB
 
       REDIS_HOST: redis
       REDIS_PORT: 6379

inclusive_dance_bot/__main__.py

@@ -28,3 +28,7 @@ def main() -> None:
     ) as loop:
         log.info("Entrypoint started")
         loop.run_forever()
+
+
+if __name__ == "__main__":
+    main()

inclusive_dance_bot/db/__main__.py

@@ -16,8 +16,8 @@ def main() -> None:
     alembic.parser.formatter_class = argparse.ArgumentDefaultsHelpFormatter
     alembic.parser.add_argument(
         "--pg-url",
-        default=os.getenv("POSTGRES_URL", DEFAULT_PG_URL),
-        help="Database URL [env var: POSTGRES_URL]",
+        default=os.getenv("PG_URL", DEFAULT_PG_URL),
+        help="Database URL [env var: PG_URL]",
     )
 
     options = alembic.parser.parse_args()

inclusive_dance_bot/db/utils.py

@@ -41,7 +41,6 @@ def make_alembic_config(cmd_opts: Namespace, base_path: Path = PROJECT_PATH) ->
     alembic_location = config.get_main_option("script_location")
     if not alembic_location:
         raise ValueError
-    print(alembic_location)
     if not os.path.isabs(alembic_location):
         config.set_main_option("script_location", str(base_path / alembic_location))
 

start.sh

@@ -0,0 +1,6 @@
+#! /usr/bin/env bash
+python -m inclusive_dance_bot.db --pg-url $PG_URL upgrade head
+
+python /app/inclusive_dance_bot/init_data.py
+
+python -m inclusive_dance_bot