Merge pull request #30 from dsrhub/zz/use-functions

Update mock dockerfile

Author: zhouzhuojie

Dockerfile

@@ -1,33 +1,30 @@
-# ARG UTASK_IMAGE=ovhcom/utask:v1.8.3
-# TODO: upgrade to ovhcom/utask:v1.8.3 when it's ready
-ARG UTASK_IMAGE=zhouzhuojie/utask:beta-with-middleware
+ARG UTASK_IMAGE=ovhcom/utask:v1.8.3
 
 
+FROM fufuhu/sql-migrate AS sql-migrate
 
 
-FROM fufuhu/sql-migrate AS sql-migrate
 FROM ${UTASK_IMAGE} AS builder
 WORKDIR /go/src/github.com/ovh/utask
 COPY init init
 COPY plugins plugins
-COPY pkg /go/src/github.com/dsrhub/dsrhub/pkg
+COPY functions functions
 RUN make
 
 
-
-
 FROM frolvlad/alpine-glibc:alpine-3.10
 RUN apk add --no-cache curl bash
 ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /wait-for-it.sh
 RUN chmod +x /wait-for-it.sh
-COPY --from=sql-migrate /bin/sql-migrate                     /usr/local/bin/sql-migrate
-COPY --from=builder     /go/src/github.com/ovh/utask/plugins /app/plugins
-COPY --from=builder     /go/src/github.com/ovh/utask/init    /app/init
-COPY --from=builder     /go/src/github.com/ovh/utask/utask   /app/utask
-COPY --from=builder     /go/src/github.com/ovh/utask/sql     /app/sql
-COPY --from=builder     /app/static                          /app/static
-COPY                    ./templates                          /app/templates
-COPY                    ./dbconfig.yml                       /app/dbconfig.yml
+COPY --from=sql-migrate /bin/sql-migrate                       /usr/local/bin/sql-migrate
+COPY --from=builder     /go/src/github.com/ovh/utask/plugins   /app/plugins
+COPY --from=builder     /go/src/github.com/ovh/utask/init      /app/init
+COPY --from=builder     /go/src/github.com/ovh/utask/utask     /app/utask
+COPY --from=builder     /go/src/github.com/ovh/utask/sql       /app/sql
+COPY --from=builder     /go/src/github.com/ovh/utask/functions /app/functions
+COPY --from=builder     /app/static                            /app/static
+COPY                    ./templates                            /app/templates
+COPY                    ./dbconfig.yml                         /app/dbconfig.yml
 RUN chmod +x /app/utask
 EXPOSE 8081
 WORKDIR /app

docker-compose.yaml

@@ -41,13 +41,9 @@ services:
       POSTGRES_DB:       utask
 
   openmock:
-    build: ./mocks
+    image: dsrhub/mock
     container_name: dsrhub_openmock
     restart: on-failure
-    environment:
-      OPENMOCK_TEMPLATES_DIR: '/data/templates'
-      OPENMOCK_GRPC_ENABLED: 'true'
-      OPENMOCK_GRPC_PORT: '50051'
     volumes:
       - "./mocks/openmock_templates:/data/templates"
     ports:

pkg/.gitkeep renamed to functions/.gitkeep

@@ -12,7 +12,7 @@ require (
 	github.com/loopfz/gadgeto v0.10.1
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/ovh/utask v1.8.3-0.20200724093550-a596736e7b3c
+	github.com/ovh/utask v1.8.3
 	github.com/philhofer/fwd v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.6.0
 	github.com/stretchr/testify v1.5.1

go.mod

@@ -244,8 +244,8 @@ github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY
 github.com/ovh/symmecrypt v0.4.3 h1:kuoiMNrcqYn2Rdn4w86KfW0fpZLSZBRUKTJT40EAyhk=
 github.com/ovh/symmecrypt v0.4.3/go.mod h1:39tehz0mgJfrpQOGUMf5J29rK1GzPiTxLFiVuk9XPO0=
 github.com/ovh/tat v5.2.5+incompatible/go.mod h1:eRL842a3T+2ept8tEg5IxitkGJL6X8wh1JkRa9DNzo0=
-github.com/ovh/utask v1.8.3-0.20200724093550-a596736e7b3c h1:xdbQcYAgTttwCJtK+Ak+WoI1rix7e8GRjVnMhM200Fg=
-github.com/ovh/utask v1.8.3-0.20200724093550-a596736e7b3c/go.mod h1:FCwrg391A4STNSOOhAaTSOA0Zaos7Iaw/aU02F76L0U=
+github.com/ovh/utask v1.8.3 h1:C0i/gW5xt03Ixyl+UKxwKvSCdV7JkhW0nDgRF7yo938=
+github.com/ovh/utask v1.8.3/go.mod h1:FCwrg391A4STNSOOhAaTSOA0Zaos7Iaw/aU02F76L0U=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
 github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=

go.sum

@@ -92,12 +92,3 @@ steps:
       then:
         this: TO_RETRY
       message: 'service is waiting for callback from remote dsrhub service'
-
-  done:
-    description: notify dsrhub that the dsrhub request is done
-    dependencies: ["callback"]
-    action:
-      type: echo
-      configuration:
-        output:
-          done: done