diff --git a/Dockerfile b/Dockerfile index 81949e9..bd6b26b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get -y update \ && useradd -r -d /opt/postal -s /bin/bash postal \ && chown -R postal:postal /opt/postal/ \ && /opt/postal/bin/postal bundle /opt/postal/vendor/bundle \ - && apt-get -y purge python-dev git-core python-setuptools \ + && apt-get -y purge python-dev git-core \ && apt-get -y autoremove \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker-compose.yml b/docker-compose.yml index 3fd4c04..0374384 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,8 @@ version: "3" services: postal: - image: catdeployed/postal:dev + build: . + #image: catdeployed/postal:dev container_name: postal command: run ports: @@ -12,7 +13,7 @@ services: volumes: - static_assets:/opt/postal/public - ./data/postal/assets:/opt/postal/public/assets - - ./data/postal/config:/opt/postal/config + - ./src/templates/:/templates environment: - MYSQL_ROOT_PASSWORD=changeme - MYSQL_DATABASE=postal diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh index 485c165..3a82aca 100755 --- a/src/docker-entrypoint.sh +++ b/src/docker-entrypoint.sh @@ -10,6 +10,7 @@ if [ ! -f /opt/postal/config/postal.yml ] || [[ $(cat /opt/postal/config/postal. ## Generate config and keys /opt/postal/bin/postal initialize-config fi +cat /opt/postal/config/postal.yml ## Clean Up rm -rf /opt/postal/tmp/pids/*