Merge branch 'master' of ssh://gogs.labs/tati/kitchn

build.json

@@ -0,0 +1,18 @@
+{
+  "subprojects": [
+    {
+      "name": "recipes",
+      "dir": "recipes",
+      "artifacts": [
+        "frontend.tar.gz"
+      ]
+    },
+    {
+      "name": "ktchn",
+      "dir": "ktchn",
+      "artifacts": [
+        "dist/bundle.js"
+      ]
+    }
+  ]
+}

build/Dockerfile

@@ -1,14 +0,0 @@
-FROM node:13.7.0-buster-slim as builder
-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 python2 make g++
-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 .
-RUN echo '/front.tar.gz' > /artifacts
-RUN echo '/kitchn/ktchn/dist/bundle.js' >> /artifacts

build/key_for_recipes

@@ -1,27 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAQEAy4wMouninKdKe7exn/hdl1nB4ztmfFQeOXAijBVlrXXowHkUPmr+
-nA37cjKwkOoctCwiodzT0ry1+SsuzAKpp9JF+Va/9X3dfaBRFeuZkYAx1CFxFuGQfgXCIS
-yo1li9xeNPe33tw5PIukk7B01101ERuLRR8Bx01bwFCmhU5iN6JokZTVP7QP0YZF4lUnAu
-zlrfSoNxmqXZ4q0CZO1i1NTAlMlCZxz60qxIkP07YyyQWPmWFtIX1iv/OFqQ5z+DgINwdr
-4Sa8MSB54RDP3L8Gbq0eLM9ehWbPmjRPtnhVPpup/NYk5yCz3ligO6mslB3XSIzQHaFrLr
-FbDCCie+VwAAA8h66StVeukrVQAAAAdzc2gtcnNhAAABAQDLjAyi6eKcp0p7t7Gf+F2XWc
-HjO2Z8VB45cCKMFWWtdejAeRQ+av6cDftyMrCQ6hy0LCKh3NPSvLX5Ky7MAqmn0kX5Vr/1
-fd19oFEV65mRgDHUIXEW4ZB+BcIhLKjWWL3F4097fe3Dk8i6STsHTXXTURG4tFHwHHTVvA
-UKaFTmI3omiRlNU/tA/RhkXiVScC7OWt9Kg3GapdnirQJk7WLU1MCUyUJnHPrSrEiQ/Ttj
-LJBY+ZYW0hfWK/84WpDnP4OAg3B2vhJrwxIHnhEM/cvwZurR4sz16FZs+aNE+2eFU+m6n8
-1iTnILPeWKA7qayUHddIjNAdoWsusVsMIKJ75XAAAAAwEAAQAAAQB3xsjk0Sa1skfFN5pB
-nWBNoNbURW8QeFt0x0S9FBZKFZlKMbW06Tc8U4oEcEmwbONJLrOOdij72Gpo3n1iNarqA3
-WDvQWmi1NcCovMj2BF2572ylsG8OMbFX5gESylPYEmwpVSAQ95yCwVWuRubqmIGSuJeirB
-Va123HZG4pAa//Ykr8kA78ujIDeP6gJPgTXWOZkX5h/vtH0NGrAgi6xMP6YN14QmJbVHiG
-V17cfS7wmdM+e4hrJ8fdeMHcW6WvNa3zzDRHzf6a2uRtrUfgt84fG2N2OS2jMsIDgkc92U
-iRB4YAEPB7g4GyuwE8hp9RaGjy8gAJVeufWXyII2M6GxAAAAgFe56J8ugEbhI0jGTWSU4D
-EmVamly8GI7Bj6YJZCFwdLksLAckg/vFFSGTbBh27Xxqd407/O1axLYPSLwL2lVpGsBuiC
-yARxB7BItk6Bob2QknPJwpUrJ1i7HHeMOjoDurMUAaIJSDsFE0xvCwo2kHUeYIQUfaOONP
-ACGgTCtwn9AAAAgQD0lOVvO6kIHwL1x6/NEig3ZfVDRsAJ3IzkMpIfHEqejF7avyAK+F/E
-NN0sZi8xpk0qMBXPgbfOpOXW603AUxAv2am/bE058SY8MqhUtg/PCNFBz9li70BhXJVBrQ
-q7lyFGST+Cbko1stb5vpUuNDz7hvt44xOMvo0leSHvVoStiQAAAIEA1Qy7Gw1T6BZeMaqe
-CjrGTtX9Yb+YQibiaLkWkk2wUqbeWoX1rLsV2YIcNkymsFLqX/pfceB53J/X6uKZQk178I
-MjzV54rXzYlM4PL4W3Uqt/+d9swWAvrIiUab2eQI/928jWUOuv6ORI+Jx712S2Za948CmN
-gkZa6i7Lp7A+9N8AAAASZGF2aWRAZGF2aWQtZG90b3BjAQ==
------END OPENSSH PRIVATE KEY-----

recipes/package.json

@@ -37,7 +37,7 @@
     "cssnano": "^4.1.10",
     "formik": "2.1.0",
     "moment": "^2.24.0",
-    "node-sass": "^4.11.0",
+    "node-sass": "^4.13.1",
     "npm": "^6.11.2",
     "ramda": "^0.26.1",
     "react": "^16.8.4",
@@ -56,7 +56,7 @@
   },
   "scripts": {
     "start": "PORT=3006 react-scripts start",
-    "build": "react-scripts build",
+    "build": "react-scripts build && cd build && tar czf ../frontend.tar.gz .",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "storybook": "start-storybook -p 9009 -s public",