Selaa lähdekoodia

Merge branch 'recipe-model-completion' of ssh://gogs.labs/tati/kitchn into recipe-model-completion

Tatiana Inama 6 vuotta sitten
vanhempi
commit
f583515cbd
3 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 0 1
      build/Dockerfile.base
  2. 1 0
      build/Dockerfile.build
  3. 3 3
      build/build.sh

+ 0 - 1
build/Dockerfile.base

@@ -4,4 +4,3 @@ RUN apt-get update && apt-get install --no-install-recommends -y git openssh-cli
 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
-RUN git clone ssh://git@gogs.davidventura.com.ar:2222/tati/kitchn.git && cd /kitchn && git checkout recipe-model-completion

+ 1 - 0
build/Dockerfile.build

@@ -1,4 +1,5 @@
 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

+ 3 - 3
build/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 docker build -f Dockerfile.base  . -t ktchn
-docker build -f Dockerfile.build  .  -t ktchn_build
+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 output/
-docker cp build_output:/kitchn/recipes/build/ output/
+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