Merge remote-tracking branch 'refs/remotes/origin/eng' into eng

.gitlab-ci.yml

@@ -3,12 +3,9 @@ include:
     file: "/templates/docker/build-template.gitlab-ci.yml"
   - project: "devops/pena-continuous-integration"
     file: "/templates/docker/deploy-template.gitlab-ci.yml"
-  - project: "devops/pena-continuous-integration"
-    file: "/templates/docker/service-discovery.gitlab-ci.yml"
 stages:
   - build
   - deploy
-  - service-discovery
 
 build-app:
   tags:
@@ -17,7 +14,7 @@ build-app:
   variables:
     DOCKER_BUILD_PATH: "./Dockerfile"
     STAGING_BRANCH: "staging"
-    PRODUCTION_BRANCH: "main"
+    PRODUCTION_BRANCH: "eng"
 
 deploy-to-staging:
   extends: .deploy_template
@@ -29,11 +26,12 @@ deploy-to-staging:
 
 deploy-to-prod:
   extends: .deploy_template
+  variables:
+    DOCKER_BUILD_PATH: "./Dockerfile"
+    STAGING_BRANCH: "staging"
+    PRODUCTION_BRANCH: "eng"
   rules:
     - if: "$CI_COMMIT_BRANCH == $PRODUCTION_BRANCH"
   tags:
     - front
     - prod
-
-service-discovery:
-  extends: .sd_artefacts_template

deployments/eng/docker-compose.yaml

@@ -0,0 +1,13 @@
+version: "3"
+services:
+  respen:
+    container_name: respen
+    restart: unless-stopped
+    image: $CI_REGISTRY_IMAGE/eng:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    hostname: respen
+    tty: true
+    networks:
+      - main_default
+networks:
+  main_default:
+    external: true

deployments/main/docker-compose.yaml

@@ -1,9 +1,8 @@
 version: "3"
 services:
-  respondent:
+  respondent_en:
-    container_name: respondent
+    container_name: respondent_en
     restart: unless-stopped
-    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: $CI_REGISTRY_IMAGE/eng:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    hostname: respondent
+    hostname: respondent_en
     tty: true
-

src/main.tsx

@@ -5,14 +5,14 @@ import { StrictMode, lazy } from "react";
 
 const routes: RouteObject[] = [
   {
-    path: "/",
+    path: "/en/",
     children: [
       {
         index: true,
         element: <App />,
       },
       {
-        path: ":quizId",
+        path: "/en/:quizId",
         element: <App />,
       },
     ],

vite.config.ts

@@ -16,6 +16,9 @@ export const alias = {
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  build: {
+    assetsDir: "en/assets/",
+  },
   resolve: {
     alias,
   },