Remove dependency to make in Dockerfile

BboyKeen · Mar 20, 2024 · 25defe3 · 25defe3
1 parent 25aa35d
commit 25defe3
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 13 deletions.
diff --git a/docker-compose.yml b/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"]
 

diff --git a/Dockerfile → docker/Dockerfile b/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 \
@@ -55,8 +52,8 @@ ARG VERSION
 ENV version=$VERSION \
     PATH=/var/www/.build/venv/bin/:$PATH
 
-COPY /docker-entrypoint.sh /
-COPY /docker-entrypoint.d/* /docker-entrypoint.d/
+COPY /docker/docker-entrypoint.sh /
+COPY /docker/docker-entrypoint.d/prod/* /docker-entrypoint.d/
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 EXPOSE 8080

diff --git a/dev_api.Dockerfile → docker/Dockerfile.dev b/dev_api.Dockerfile → docker/Dockerfile.dev
@@ -41,10 +41,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 +49,6 @@ RUN set -x \
 ENV version='' \
     PATH=/var/www/.build/venv/bin/:$PATH
 
-RUN make -f config/docker-dev template
+COPY /docker/docker-entrypoint.sh /
+COPY /docker/docker-entrypoint.d/dev/* /docker-entrypoint.d/
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/docker/postgresql.conf → docker/conf/postgresql.conf b/docker/postgresql.conf → docker/conf/postgresql.conf
diff --git a/docker/docker-entrypoint.d/dev/10-run-make-cmds.sh b/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
diff --git a/docker-entrypoint.d/10-env-replace.sh → ...ocker-entrypoint.d/prod/10-env-replace.sh b/docker-entrypoint.d/10-env-replace.sh → ...ocker-entrypoint.d/prod/10-env-replace.sh
diff --git a/docker/docker-entrypoint.d/prod/20-run-make-cmds.sh b/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 
diff --git a/docker-entrypoint.sh → docker/docker-entrypoint.sh b/docker-entrypoint.sh → docker/docker-entrypoint.sh