Remove dependency to make in Dockerfile

.dockerignore

@@ -1,4 +1,7 @@
 .build/
 .git/
 .gitignore
+.gitattributes
 .travis.yml
+.github
+

docker-compose.yml

@@ -2,8 +2,8 @@ version: "3.7"
 services:
   api:
     build:
-      context: .
-      dockerfile: dev_api.Dockerfile
+      context: ./docker
+      dockerfile: Dockerfile.dev
     depends_on:
       - postgresql
       - elasticsearch
@@ -37,7 +37,7 @@ services:
       POSTGRES_PASSWORD: test
     volumes:
       - postgres_data:/var/lib/postgresql/data
-      - ./docker/postgresql.conf:/etc/postgresql.conf
+      - ./docker/conf/postgresql.conf:/etc/postgresql.conf
       - .:/v6_api
     command: ["postgres", "-c", "config_file=/etc/postgresql.conf"]
 

Dockerfile → docker/Dockerfile

@@ -43,9 +43,6 @@ RUN set -x \
     git
 
 RUN set -x \
- && make -f config/dev install \
- && py3compile -f .build/venv/ \
- && rm -fr .cache \
  && apt-get -y purge \
  && apt-get -y --purge autoremove \
  && apt-get clean \
@@ -56,7 +53,7 @@ ENV version=$VERSION \
     PATH=/var/www/.build/venv/bin/:$PATH
 
 COPY /docker-entrypoint.sh /
-COPY /docker-entrypoint.d/* /docker-entrypoint.d/
+COPY /docker-entrypoint.d/prod/* /docker-entrypoint.d/
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 EXPOSE 8080

dev_api.Dockerfile → docker/Dockerfile.dev

@@ -13,8 +13,6 @@ RUN set -x \
     && dpkg-reconfigure locales \
     && /usr/sbin/update-locale LANG=en_US.UTF-8
 
-COPY ./ /var/www/
-
 WORKDIR /var/www/
 
 RUN set -x \
@@ -41,10 +39,6 @@ RUN set -x \
     git
 
 RUN set -x \
- && make -f config/docker-dev install \
- && make -f config/docker-dev .build/dev-requirements.timestamp \
- && py3compile -f .build/venv/ \
- && rm -fr .cache \
  && apt-get -y purge \
  && apt-get -y --purge autoremove \
  && apt-get clean \
@@ -53,4 +47,6 @@ RUN set -x \
 ENV version='' \
     PATH=/var/www/.build/venv/bin/:$PATH
 
-RUN make -f config/docker-dev template
+COPY /docker-entrypoint.sh /
+COPY /docker-entrypoint.d/dev/* /docker-entrypoint.d/
+ENTRYPOINT ["/docker-entrypoint.sh"]

docker/docker-entrypoint.d/dev/10-run-make-cmds.sh

@@ -0,0 +1,8 @@
+#!/bin/sh -ex
+
+cd /var/www
+make -f config/docker-dev install 
+make -f config/docker-dev .build/dev-requirements.timestamp 
+py3compile -f .build/venv/ 
+rm -fr .cache 
+make -f config/docker-dev template

docker/docker-entrypoint.d/prod/20-run-make-cmds.sh

@@ -0,0 +1,6 @@
+#!/bin/sh -ex
+
+cd /var/www
+make -f config/dev install 
+py3compile -f .build/venv/ 
+rm -fr .cache