Merge branch 'master' into revert-13047-revert-13043-fix/updating-users-via-public-api
This commit is contained in:
commit
77fdc69f15
|
@ -66,6 +66,7 @@ COPY packages/server/dist/ dist/
|
||||||
COPY packages/server/docker_run.sh .
|
COPY packages/server/docker_run.sh .
|
||||||
COPY packages/server/builder/ builder/
|
COPY packages/server/builder/ builder/
|
||||||
COPY packages/server/client/ client/
|
COPY packages/server/client/ client/
|
||||||
|
COPY packages/server/pm2.config.js .
|
||||||
|
|
||||||
ARG BUDIBASE_VERSION
|
ARG BUDIBASE_VERSION
|
||||||
ARG GIT_COMMIT_SHA
|
ARG GIT_COMMIT_SHA
|
||||||
|
|
|
@ -37,6 +37,7 @@ RUN apk del .gyp \
|
||||||
|
|
||||||
COPY packages/worker/dist/ dist/
|
COPY packages/worker/dist/ dist/
|
||||||
COPY packages/worker/docker_run.sh .
|
COPY packages/worker/docker_run.sh .
|
||||||
|
COPY packages/server/pm2.config.js .
|
||||||
|
|
||||||
EXPOSE 4001
|
EXPOSE 4001
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue