swap react app for Oracle Jet app

app/Dockerfile

@@ -2,7 +2,6 @@ FROM nginx:1.23-alpine-slim
 
 RUN apk add --update nodejs npm
 
-
 WORKDIR /usr/share/build
 
 RUN mkdir -p /usr/share/build/src \
@@ -16,8 +15,10 @@ COPY *.json /usr/share/build/
 
 RUN npm install
 RUN npm install -g @oracle/ojet-cli
-RUN npx ojet build web --release 
+RUN ojet build web --release 
+
+RUN cp -R /usr/share/build/web/* /usr/share/nginx/html/
 
 EXPOSE 80
 
-RUN cp -R /usr/share/build/web/* /usr/share/nginx/html/
+CMD ["nginx", "-g", "daemon off;"]

deploy/k8s/app/app-svc.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: app
+ name: app
+spec:
+ ports:
+ - port: 80
+ protocol: TCP
+ targetPort: 80
+ selector:
+ app: app

deploy/k8s/app/app.yaml

@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ labels:
+ app: app
+ name: app
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: app
+ strategy: 
+ type: RollingUpdate
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 1
+ template:
+ metadata:
+ labels:
+ app: app
+ spec:
+ containers:
+ - image: app
+ name: app
+ readinessProbe:
+ httpGet:
+ scheme: HTTP
+ path: /index.html
+ port: 80
+ initialDelaySeconds: 10
+ periodSeconds: 5
+ ports:
+ - containerPort: 80
+ resources: 
+ requests:
+ cpu: 100m
+ memory: 256Mi
+ limits:
+ cpu: 250m
+ memory: 521Mi
+ imagePullSecrets:
+ - name: ocir-secret

deploy/k8s/app/kustomization.yaml

@@ -0,0 +1,4 @@
+resources:
+ - app.yaml
+ - app-svc.yaml
+namespace: backend

deploy/k8s/ingress/ingress.yaml

@@ -23,17 +23,17 @@ spec:
  name: backend
  port:
  number: 8080
- - path: /summary
- pathType: Prefix
- backend:
- service:
- name: web
- port:
- number: 80
+ # - path: /summary
+ #  pathType: Prefix
+ #  backend:
+ #  service:
+ #  name: web
+ #  port:
+ #  number: 80
  - path: /
  pathType: Prefix
  backend:
  service:
- name: web
+ name: app
  port:
  number: 80

deploy/k8s/overlays/prod/kustomization.yaml.mustache

@@ -1,11 +1,11 @@
 resources:
  - "../../ingress"
- - "../../web"
+ - "../../app"
  - "../../backend"
 
 images:
-- name: web
- newName: {{region_key}}.ocir.io/{{{tenancy_namespace}}}/{{{project_name}}}/web
+- name: app
+ newName: {{region_key}}.ocir.io/{{{tenancy_namespace}}}/{{{project_name}}}/app
  newTag: {{{web_version}}}
 - name: backend
  newName: {{region_key}}.ocir.io/{{{tenancy_namespace}}}/{{{project_name}}}/backend

scripts/kustom.mjs

@@ -19,6 +19,7 @@ const namespace = config.get("namespace");
 const regionName = config.get("regionName");
 const regionKey = config.get("regionKey");
 const webVersion = config.get("webVersion");
+const appVersion = config.get("appVersion");
 const backendVersion = config.get("backendVersion");
 const certFullchain = config.get("certFullchain");
 const certPrivateKey = config.get("certPrivateKey");
@@ -71,6 +72,7 @@ async function createProdKustomization() {
  region_key: regionKey,
  tenancy_namespace: namespace,
  project_name: projectName,
+ app_version: appVersion,
  web_version: webVersion,
  backend_version: backendVersion,
  });

scripts/release.mjs

@@ -32,6 +32,9 @@ const pwdOutput = (await $`pwd`).stdout.trim();
 await cd(`${pwdOutput}/web`);
 const webVersion = await getNpmVersion();
 config.set("webVersion", webVersion);
+await cd(`${pwdOutput}/app`);
+const appVersion = await getNpmVersion();
+config.set("appVersion", appVersion);
 await cd(`${pwdOutput}/backend`);
 const backendVersion = await getVersionGradle();
 config.set("backendVersion", backendVersion);
@@ -51,6 +54,7 @@ config.set("ocir_user_token", ocir_user_token);
 
 await containerLogin(namespace, ocir_user, ocir_user_token, ocirUrl);
 await releaseWeb();
+await releaseApp();
 await releaseBackend();
 
 async function releaseWeb() {
@@ -66,6 +70,19 @@ async function releaseWeb() {
  await cd("..");
 }
 
+async function releaseApp() {
+ const service = "app";
+ await cd(service);
+ const imageName = `${projectName}/${service}`;
+ await buildImage(`localhost/${imageName}`, appVersion);
+ const localImage = `localhost/${imageName}:${appVersion}`;
+ const remoteImage = `${ocirUrl}/${namespace}/${imageName}:${appVersion}`;
+ await tagImage(localImage, remoteImage);
+ await pushImage(remoteImage);
+ console.log(`${chalk.green(remoteImage)} pushed`);
+ await cd("..");
+}
+
 async function releaseBackend() {
  const service = "backend";
  await cd(service);