diff --git a/.github/workflows/modified-dev.yml b/.github/workflows/modified-dev.yml index 6afa96b..569318b 100644 --- a/.github/workflows/modified-dev.yml +++ b/.github/workflows/modified-dev.yml @@ -132,7 +132,7 @@ jobs: # Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build # Otherwise, point this to your Dockerfile/Containerfile relative to the repository root. dockerfiles: | - ./backend/Dockerfile + ./backend/Dockerfile1 context: ./backend # https://github.com/redhat-actions/push-to-registry#readme @@ -157,7 +157,7 @@ jobs: # Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build # Otherwise, point this to your Dockerfile/Containerfile relative to the repository root. dockerfiles: | - ./frontend/Dockerfile + ./frontend/Dockerfile1 context: ./frontend # https://github.com/redhat-actions/push-to-registry#readme diff --git a/backend/Dockerfile1 b/backend/Dockerfile1 new file mode 100644 index 0000000..f95c27f --- /dev/null +++ b/backend/Dockerfile1 @@ -0,0 +1,14 @@ +FROM artifacts.developer.gov.bc.ca/docker-remote/node:18.16.0-alpine3.18 + +RUN mkdir -p /logs +RUN chmod 755 /logs + +WORKDIR /opt/app-root/src +RUN ln -s /logs . + +COPY package*.json ./ +RUN npm ci + +COPY . /opt/app-root/src +EXPOSE 443 8080 +CMD ["node", "--max-old-space-size=150", "./src/server.js"] \ No newline at end of file diff --git a/backend/package-lock.json b/backend/package-lock.json index 6bc8c84..8003383 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "edx-backend", + "name": "iosas-backend", "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "edx-backend", + "name": "iosas-backend", "version": "0.0.1", "license": "Apache-2.0", "dependencies": { diff --git a/backend/package.json b/backend/package.json index 633ec56..12a9511 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,7 +1,7 @@ { - "name": "edx-backend", + "name": "iosas-backend", "version": "0.0.1", - "description": "The backend portion of the EDX web app", + "description": "The backend portion of the IOSAS web app", "scripts": { "serve": "npm run setlocal && npm run servecmd", "serve-linux": "export NODE_ENV='local' && nodemon ./src/server.js", @@ -165,9 +165,9 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "git+https://github.com/bcgov/EDUC-EDX.git" + "url": "git+https://github.com/bcgov/ECC-IOSAS.git" }, "bugs": { - "url": "https://github.com/bcgov/EDUC-EDX/issues" + "url": "https://github.com/bcgov/ECC-IOSAS/issues" } } diff --git a/frontend/Dockerfile1 b/frontend/Dockerfile1 new file mode 100644 index 0000000..f82e306 --- /dev/null +++ b/frontend/Dockerfile1 @@ -0,0 +1,12 @@ +FROM artifacts.developer.gov.bc.ca/docker-remote/node:14.20.1 as build-stage +WORKDIR /frontend +COPY package*.json ./ +RUN npm install +COPY ./ . +RUN npm run build + +FROM artifacts.developer.gov.bc.ca/docker-remote/caddy:2.4.6-alpine as caddy-stage + +EXPOSE 2015 +COPY Caddyfile /etc/caddy/Caddyfile +COPY --from=build-stage /frontend/dist /srv \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d7f5cf1..e8476e5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "edx", + "name": "iosas", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "edx", + "name": "iosas", "version": "1.0.0", "dependencies": { "@braintree/sanitize-url": "^6.0.2", diff --git a/frontend/package.json b/frontend/package.json index cc4df3c..92104dc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "edx", + "name": "iosas", "version": "1.0.0", "private": true, "description": "IOSAS Independent School Portal",