diff --git a/.dockerignore b/.dockerignore index 203a62c..fd804ef 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,3 @@ data publicDirs nextStatic devel -.git diff --git a/.gitmodules b/.gitmodules index 76e63d4..15a8424 100755 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "modules/qmining/qmining-page"] path = submodules/qmining-page - url = git@gitlab.com:MrFry/qmining-page.git + url = https://gitlab.com/MrFry/qmining-page [submodule "modules/dataEditor/qmining-data-editor"] path = submodules/qmining-data-editor - url = git@gitlab.com:MrFry/qmining-data-editor.git + url = https://gitlab.com/MrFry/qmining-data-editor [submodule "qminingPublic/moodle-test-userscript"] path = submodules/moodle-test-userscript - url = git@gitlab.com:MrFry/moodle-test-userscript.git + url = https://gitlab.com/MrFry/moodle-test-userscript diff --git a/Dockerfile b/Dockerfile index 0d4c940..c616a7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,26 @@ -FROM node:16 +FROM docker.io/node:19.8.1-alpine3.17 as builder WORKDIR /server -COPY package.json ./ -COPY package-lock.json ./ -# RUN npm i +RUN apk add python3 \ + make \ + gcc \ + g++ \ + libc-dev \ + git \ + openssh-client \ + bash + COPY . . -# RUN npm run export +RUN npm install +RUN bash ./scripts/setup.sh -# CMD [ "bash", "scripts/make.sh" ] -# CMD [ "npm", "run", "start" ] -CMD [ "scripts/start.sh" ] +FROM docker.io/node:19.8.1-alpine3.17 -EXPOSE 80 -EXPOSE 8080 +# required for some API info +RUN apk add git + +WORKDIR /server +COPY --from=builder /server . + +CMD ["npm", "run", "start"]