#448 Use python image in drone (#465)

* #448  Improve deps code for nodejs image

* #448  Revert node's image and drone workspaces switching

* #448  Use python image in tests

* #448  Use python image in tests#2

* #448  Drone build python-dev with pull_request too

* #448  Fix python-prod building

.drone.yml

@@ -6,23 +6,9 @@ workspace:
 
 
 pipeline:
-  # @todo #352:60m Use ready image for python in drone. stb2
-  #  - rm pip-install step
-  #  - refactor test step
-  #  - rm/modify docker-build step
-  pip-install:
-    image: python
-    commands:
-      - pip install -r requirements.txt
-      - rm -rf /usr/app/deps/site-packages
-      - mv /usr/local/lib/python3.6/site-packages /drone/deps
-    when:
-      event: [push, pull_request]
 
   nodejs-build:  # with `npm install` inside
     image: docker/compose:1.22.0
-    environment:
-      - DEPS_DIR=/drone/deps
     commands:
       - cd docker/
       - cp drone_env/.env . && cp drone_env/* env_files/
@@ -38,16 +24,27 @@ pipeline:
   gulp-build:
     image: fidals/se-nodejs:dev
     environment:
-      - DEPS_DIR=/drone/deps
+      # deps from nodejs image
+      - DEPS_DIR=/usr/app/deps
     commands:
-      - cd /usr/app/src/
+      - cp -r /usr/app/src/node_modules .
       - gulp build
-      - cp -r front_build/ /drone/shopelectro
+    when:
+      event: [push, pull_request]
+
+  python-build:
+    image: docker/compose:1.22.0
+    commands:
+      - cd docker/
+      # Build python images with sources and static files
+      - docker-compose -f docker-compose-build.yml build python-dev python-prod
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
     when:
       event: [push, pull_request]
 
   test:
-    image: python
+    image: fidals/se:dev
     environment:
       - TEST_ENV=true
       - DJANGO_SETTINGS_MODULE=shopelectro.settings.drone
@@ -67,7 +64,6 @@ pipeline:
       - SELENIUM_TIMEOUT_SECONDS=180
       - SELENIUM_WAIT_SECONDS=180
     commands:
-      - cp -r /drone/deps/* /usr/local/lib/python3.6/site-packages
       - python manage.py migrate
       - python manage.py excel
       - python manage.py price
@@ -103,19 +99,6 @@ pipeline:
     when:
       event: pull_request
 
-  docker-build:
-    image: docker/compose:1.17.1
-    environment:
-      - DEPS_DIR=/drone/deps
-    commands:
-      - cd docker
-      # Build python images with sources and static files
-      - docker-compose -f docker-compose-build.yml build --no-cache python-dev python-prod
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    when:
-      event: push
-
   docker-push:
     image: docker:latest
     environment:

docker/docker-compose-build.yml

@@ -18,8 +18,6 @@ services:
     image: fidals/se-nodejs:dev
     build:
       context: ../
-      args:
-        - deps_dir=$DEPS_DIR
       dockerfile: docker/images/node/Dockerfile
 
   nginx:

docker/docker-compose.yml

@@ -44,8 +44,6 @@ services:
       #- ../gulpfile.babel.js:/usr/app/src/gulpfile.babel.js
       - ../front:/usr/app/src/front
       - ../front_build:/usr/app/src/front_build
-      # @todo #457:15m Return back refarm deps to nodejs service.
-
       # Uncomment next line if you dev refarm-site's front
       # - ../../refarm-site/:$DEPS_DIR/
     env_file:

docker/images/node/Dockerfile

@@ -1,7 +1,6 @@
 FROM node:slim
 
-ARG deps_dir
-ENV DEPS_DIR=$deps_dir
+ENV DEPS_DIR=/usr/app/deps
 
 WORKDIR /usr/app/src/
 
@@ -26,4 +25,4 @@ RUN npm install --no-optional
 RUN gulp build
 
 # Keeps track of changes if static files are built, otherwise builds them
-CMD bash -c "[ '$(ls -A /usr/app/src/build)' ] && gulp watch || (gulp build && gulp watch)"
+CMD bash -c "[ '$(ls -A /usr/app/src/front_build)' ] && gulp watch || (gulp build && gulp watch)"

docker/images/python/Dockerfile.prod

@@ -7,4 +7,4 @@ COPY ./etc/gunicorn.py /etc/
 # See npm section of `.drone.yml` file
 COPY ./front_build ./front_build
 # built frontend files are required
-RUN /bin/bash -c '[ "$(ls -A front/build)" ] || exit 1'
+RUN /bin/bash -c '[ "$(ls -A front_build)" ] || exit 1'