diff options
| author |  Vijay A <avijayr@protonmail.com> | 2021-05-13 21:12:39 +0530 |
|---|---|---|
| committer |  Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-05-15 14:13:49 +0530 |
| commit | a3e68f08168aa91add5fad7277b1084fd7d9ed64 (patch) | |
| tree | 86eb99ac4f79ffa8f68f7b32c7cdef6022ca3c83 | |
| parent | New Crowdin updates (#1412) (diff) | |
| download | ferdium-app-a3e68f08168aa91add5fad7277b1084fd7d9ed64.tar.gz ferdium-app-a3e68f08168aa91add5fad7277b1084fd7d9ed64.tar.zst ferdium-app-a3e68f08168aa91add5fad7277b1084fd7d9ed64.zip | |
Fixing the broken build process when building using the Dockerfile.
| -rw-r--r-- | .dockerignore | 28 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Dockerfile | 10 |
3 files changed, 26 insertions, 15 deletions
diff --git a/.dockerignore b/.dockerignore index 78b3e36d8..89570af5b 100644 --- a/.dockerignore +++ b/.dockerignore | |||
| @@ -1,18 +1,24 @@ | |||
| 1 | node_modules | 1 | **/node_modules |
| 2 | flow-typed | 2 | flow-typed |
| 3 | out | 3 | out |
| 4 | .DS_Store | 4 | **/.DS_Store |
| 5 | .idea | 5 | **/.idea |
| 6 | build | 6 | **/build |
| 7 | .tmp | 7 | .tmp |
| 8 | .stage | 8 | .stage |
| 9 | .env | 9 | **/.env |
| 10 | yarn-error.log | 10 | **/yarn-error.log |
| 11 | npm-debug.log* | 11 | **/npm-debug.log* |
| 12 | lerna-debug.log | 12 | **/lerna-debug.log |
| 13 | uidev/lib | 13 | uidev/lib |
| 14 | *.tsbuildinfo | 14 | **/*.tsbuildinfo |
| 15 | .dockerignore | 15 | .dockerignore |
| 16 | Dockerfile | 16 | Dockerfile |
| 17 | .git* | 17 | **/.git* |
| 18 | *.md | 18 | **/*.md |
| 19 | **/server*.log | ||
| 20 | recipes/archives | ||
| 21 | packages/forms/lib | ||
| 22 | packages/theme/lib | ||
| 23 | packages/ui/lib | ||
| 24 | tmp-out/ | ||
diff --git a/.gitignore b/.gitignore index 626cd7ea2..40c8ba96a 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -12,4 +12,5 @@ yarn-error.log | |||
| 12 | npm-debug.log* | 12 | npm-debug.log* |
| 13 | lerna-debug.log | 13 | lerna-debug.log |
| 14 | uidev/lib | 14 | uidev/lib |
| 15 | *.tsbuildinfo \ No newline at end of file | 15 | *.tsbuildinfo |
| 16 | server*.log | ||
diff --git a/Dockerfile b/Dockerfile index c30270660..881332c19 100644 --- a/Dockerfile +++ b/Dockerfile | |||
| @@ -11,12 +11,16 @@ WORKDIR /usr/src/ferdi | |||
| 11 | COPY package*.json ./ | 11 | COPY package*.json ./ |
| 12 | COPY lerna.json ./ | 12 | COPY lerna.json ./ |
| 13 | 13 | ||
| 14 | RUN npm i gulp@^4.0.0 | 14 | # Note: This is being set to bypass the error with missing git repo information for the 'preval-build-info' module |
| 15 | RUN npx lerna bootstrap | 15 | ENV PREVAL_BUILD_INFO_PLACEHOLDERS=true |
| 16 | |||
| 17 | RUN npm i node-gyp@8.0.0 node-sass@5.0.0 \ | ||
| 18 | && npx lerna bootstrap | ||
| 16 | 19 | ||
| 17 | COPY . . | 20 | COPY . . |
| 18 | 21 | ||
| 19 | RUN npm run build | 22 | RUN cd recipes && npm i && npm run package && cd .. \ |
| 23 | && npm run build | ||
| 20 | 24 | ||
| 21 | FROM busybox | 25 | FROM busybox |
| 22 | 26 | ||