update build

build/Dockerfile

@@ -0,0 +1,19 @@
+FROM node:13.7.0-buster-slim
+RUN echo 'Acquire::http::Proxy "http://proxies.labs:3142/apt-cacher/";' > /etc/apt/apt.conf.d/01proxy
+RUN apt-get update && apt-get install --no-install-recommends -y git openssh-client ca-certificates s4cmd
+RUN mkdir /root/.ssh/ && chmod 700 /root/.ssh
+ADD key_for_recipes /root/.ssh/id_rsa
+RUN chmod 700 /root/.ssh/id_rsa
+RUN ssh-keyscan -H -p 2222 gogs.davidventura.com.ar  > /root/.ssh/known_hosts
+ARG TAG
+RUN git clone ssh://git@gogs.davidventura.com.ar:2222/tati/kitchn.git && cd /kitchn && git checkout $TAG
+RUN cd /kitchn/ktchn && npm install && npm run build
+RUN cd /kitchn/recipes && npm install && npm run build
+RUN cd /kitchn/recipes/build && tar czf /front.tar.gz .
+ARG S3_ACCESS_KEY
+ARG S3_SECRET_KEY
+ENV http_proxy=
+RUN s4cmd --endpoint-url=http://ci.labs:9000 ls s3://recipes/${TAG}/ || s4cmd --endpoint-url=http://ci.labs:9000 mb s3://recipes/${TAG}/
+RUN s4cmd --endpoint-url=http://ci.labs:9000 put --force /front.tar.gz s3://recipes/${TAG}/
+RUN s4cmd --endpoint-url=http://ci.labs:9000 put --force /kitchn/ktchn/dist/bundle.js s3://recipes/${TAG}/
+ENTRYPOINT /bin/false

build/Dockerfile.base

@@ -1,6 +0,0 @@
-FROM node:13.7.0-buster-slim
-RUN echo 'Acquire::http::Proxy "http://proxies.labs:3142/apt-cacher/";' > /etc/apt/apt.conf.d/01proxy
-RUN apt-get update && apt-get install --no-install-recommends -y git openssh-client ca-certificates
-RUN mkdir /root/.ssh/ && chmod 700 /root/.ssh
-ADD key_for_recipes /root/.ssh/id_rsa
-RUN ssh-keyscan -H -p 2222 gogs.davidventura.com.ar  > /root/.ssh/known_hosts

build/Dockerfile.build

@@ -1,5 +0,0 @@
-FROM ktchn:latest
-RUN git clone ssh://git@gogs.davidventura.com.ar:2222/tati/kitchn.git && cd /kitchn && git checkout recipe-model-completion
-RUN cd /kitchn/ktchn && npm install && npm run build
-RUN cd /kitchn/recipes && npm install && npm run build
-ENTRYPOINT /bin/bash

build/build.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-docker build -f Dockerfile.base  . -t ktchn
-docker build -f Dockerfile.build  --no-cache .  -t ktchn_build
-docker create --name build_output -it ktchn_build
-docker cp build_output:/kitchn/ktchn/dist/bundle.js backend_output/
-docker cp build_output:/kitchn/recipes/build/ frontend_output/
-docker rm -f build_output

build/key_for_recipes

@@ -0,0 +1,27 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAQEA3UNcywC2+0PZ9YBBz8o+KCfP2Y0Z5r1G4nLmsJLhC5Dq7Q1ppj7X
+Hw5sI3enqfQGePcCaEYsHms5DNiKBYe3c7VJuxXVXnLN8ahWsYy8ydq7p5Xu3JEOFL4y6o
+2Kke9LFNRylGXs2SMpGdGb/bTT+frsTqBRGEwCv/5ar8xuPVKh1x52veZz/P22Dm0jHAEr
+5PYsFsYQU53p/Mht3IFA8mr0F9hrkfrH2PpavwN9rvPvctvlM4GsQaSoam8c4vEB8hVyCr
+ccyZLe6fc31iD/nKPH2nQP2S2EtaZBObuMN3AAmM/JnhgQTRt0MsE8/V7lPWU4KklZwD/O
+uOhW4prp6QAAA8hz0uJ7c9LiewAAAAdzc2gtcnNhAAABAQDdQ1zLALb7Q9n1gEHPyj4oJ8
+/ZjRnmvUbicuawkuELkOrtDWmmPtcfDmwjd6ep9AZ49wJoRiweazkM2IoFh7dztUm7FdVe
+cs3xqFaxjLzJ2runle7ckQ4UvjLqjYqR70sU1HKUZezZIykZ0Zv9tNP5+uxOoFEYTAK//l
+qvzG49UqHXHna95nP8/bYObSMcASvk9iwWxhBTnen8yG3cgUDyavQX2GuR+sfY+lq/A32u
+8+9y2+UzgaxBpKhqbxzi8QHyFXIKtxzJkt7p9zfWIP+co8fadA/ZLYS1pkE5u4w3cACYz8
+meGBBNG3QywTz9XuU9ZTgqSVnAP8646FbimunpAAAAAwEAAQAAAQEAmaizY4N+j+aiEj1c
+9voDyo1Dalj0WOqvtImJLa0DPq4IiFHdQge4C6hPbx4kwQFoEU+xS0sYTpO2Dfa/e3Gx9F
+g8+QEDqdDetulqM2mCnkgaNBsKxAC0n7Eq2Pss9YYSRUf4vpg+MNmbLIQF6d5Pq/YXb88k
+IlR/QGhbAGVfVZOnod8usXFwv+Ck9zBhgl4T3wiosoWvx83ZZHpmXAVRH7I5/mp2NaNHwH
+VSXkzk8OZuCbkNsXKm+tK8PXZUBlsPudT4aKFgyUtjNMcIGndJJKLKDiSYtqHog8RgWMsq
+AVAxrtF3D2eOZskdFWsg88iF/h5rP4Zu9VoCABkhHTimpQAAAIBKJrlAFg3Ys89wqoh+/U
+OmTORClwXAeP2Tw+4ZifZ8tbfNwE0kIUL5JoF+FeS+uJpWVSdWPI271wt9IJcWhYppUj66
+BsTg5+3zIbv23drGZ32IYVAws7qfcD9eLZentcxO042pr7o7Lo/5WnuKFPAToVJtwGH/Yf
+dFKiCWEQ9NoAAAAIEA7ilWNwXdA5ns1xn7fK27YJG9tWfvFDxbh9oX3miMZNTB0bP6QU3P
+a2AeiByZCvM3QC3HeqFn3fRQjbXjRd/x8xDMRNuC9eKNellHm6WnKwRa488KdKD++qHmuV
++nXv85/rziyO8k11h2IwgcF3HUv08VpR6oyinzQjL4HkY3uBsAAACBAO3WAYdBvGxypmDK
+0wiM89K7dhzQp1o9tlkZrKKbyYrti2GNeL8+SHp7UPiE9RpaQIvgwYKxSFZP1rpYpUco+t
+mv7LLHzJkAriZfB3mq2JwmmOqE4Z39vhrmW16sCBcT6znb8/1Dp3mPTpytE51v/hNr+5EC
+cwl0Wo7oUgdtC45LAAAAEmRhdmlkQGRhdmlkLWRvdG9wYw==
+-----END OPENSSH PRIVATE KEY-----