Skip to content

Commit 1f95dc9

Browse files
committed
Modified Dockerfile scripts
1 parent 853b1c9 commit 1f95dc9

File tree

7 files changed

+37
-11
lines changed

7 files changed

+37
-11
lines changed

.github/workflows/modified-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
# Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build
133133
# Otherwise, point this to your Dockerfile/Containerfile relative to the repository root.
134134
dockerfiles: |
135-
./backend/Dockerfile
135+
./backend/Dockerfile1
136136
context: ./backend
137137

138138
# https://github.com/redhat-actions/push-to-registry#readme
@@ -157,7 +157,7 @@ jobs:
157157
# Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build
158158
# Otherwise, point this to your Dockerfile/Containerfile relative to the repository root.
159159
dockerfiles: |
160-
./frontend/Dockerfile
160+
./frontend/Dockerfile1
161161
context: ./frontend
162162

163163
# https://github.com/redhat-actions/push-to-registry#readme

backend/Dockerfile1

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM artifacts.developer.gov.bc.ca/docker-remote/node:18.16.0-alpine3.18
2+
3+
RUN mkdir -p /logs
4+
RUN chmod 755 /logs
5+
6+
WORKDIR /opt/app-root/src
7+
RUN ln -s /logs .
8+
9+
COPY package*.json ./
10+
RUN npm ci
11+
12+
COPY . /opt/app-root/src
13+
EXPOSE 443 8080
14+
CMD ["node", "--max-old-space-size=150", "./src/server.js"]

backend/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "edx-backend",
2+
"name": "iosas-backend",
33
"version": "0.0.1",
4-
"description": "The backend portion of the EDX web app",
4+
"description": "The backend portion of the IOSAS web app",
55
"scripts": {
66
"serve": "npm run setlocal && npm run servecmd",
77
"serve-linux": "export NODE_ENV='local' && nodemon ./src/server.js",
@@ -165,9 +165,9 @@
165165
"license": "Apache-2.0",
166166
"repository": {
167167
"type": "git",
168-
"url": "git+https://github.com/bcgov/EDUC-EDX.git"
168+
"url": "git+https://github.com/bcgov/ECC-IOSAS.git"
169169
},
170170
"bugs": {
171-
"url": "https://github.com/bcgov/EDUC-EDX/issues"
171+
"url": "https://github.com/bcgov/ECC-IOSAS/issues"
172172
}
173173
}

frontend/Dockerfile1

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM artifacts.developer.gov.bc.ca/docker-remote/node:14.20.1 as build-stage
2+
WORKDIR /frontend
3+
COPY package*.json ./
4+
RUN npm install
5+
COPY ./ .
6+
RUN npm run build
7+
8+
FROM artifacts.developer.gov.bc.ca/docker-remote/caddy:2.4.6-alpine as caddy-stage
9+
10+
EXPOSE 2015
11+
COPY Caddyfile /etc/caddy/Caddyfile
12+
COPY --from=build-stage /frontend/dist /srv

frontend/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "edx",
2+
"name": "iosas",
33
"version": "1.0.0",
44
"private": true,
55
"description": "IOSAS Independent School Portal",

0 commit comments

Comments
 (0)