refactor(docker-compose): incorporate standalone build
This commit is contained in:
@@ -3,7 +3,8 @@ services:
|
||||
main:
|
||||
build:
|
||||
context: ./docker
|
||||
image: automatischio/automatisch
|
||||
dockerfile: Dockerfile.compose
|
||||
entrypoint: /compose-entrypoint.sh
|
||||
ports:
|
||||
- '3000:3000'
|
||||
depends_on:
|
||||
@@ -28,7 +29,8 @@ services:
|
||||
worker:
|
||||
build:
|
||||
context: ./docker
|
||||
image: automatischio/automatisch
|
||||
dockerfile: Dockerfile.compose
|
||||
entrypoint: /compose-entrypoint.sh
|
||||
depends_on:
|
||||
- main
|
||||
environment:
|
||||
@@ -52,7 +54,7 @@ services:
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
|
||||
test: ['CMD-SHELL', 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}']
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
11
docker/Dockerfile.compose
Normal file
11
docker/Dockerfile.compose
Normal file
@@ -0,0 +1,11 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM automatischio/automatisch:0.2.0
|
||||
WORKDIR /automatisch
|
||||
|
||||
RUN apk add --no-cache openssl dos2unix
|
||||
|
||||
COPY ./compose-entrypoint.sh /compose-entrypoint.sh
|
||||
RUN dos2unix /compose-entrypoint.sh
|
||||
|
||||
EXPOSE 3000
|
||||
ENTRYPOINT ["sh", "/compose-entrypoint.sh"]
|
18
docker/compose-entrypoint.sh
Executable file
18
docker/compose-entrypoint.sh
Executable file
@@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
if [ ! -f /automatisch/storage/.env ]; then
|
||||
>&2 echo "Saving environment variables"
|
||||
ENCRYPTION_KEY="${ENCRYPTION_KEY:-$(openssl rand -base64 36)}"
|
||||
APP_SECRET_KEY="${APP_SECRET_KEY:-$(openssl rand -base64 36)}"
|
||||
echo "ENCRYPTION_KEY=$ENCRYPTION_KEY" >> /automatisch/storage/.env
|
||||
echo "APP_SECRET_KEY=$APP_SECRET_KEY" >> /automatisch/storage/.env
|
||||
fi
|
||||
|
||||
# initiate env. vars. from /automatisch/storage/.env file
|
||||
export $(grep -v '^#' /automatisch/storage/.env | xargs)
|
||||
|
||||
echo "Environment variables have been set!"
|
||||
|
||||
sh /entrypoint.sh
|
Reference in New Issue
Block a user