diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4700dc..7b45c8e 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/deployments/eng/docker-compose.yaml b/deployments/eng/docker-compose.yaml
new file mode 100644
index 0000000..aca24bc
--- /dev/null
+++ b/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
diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml
index bd71037..cf21d55 100644
--- a/deployments/main/docker-compose.yaml
+++ b/deployments/main/docker-compose.yaml
@@ -1,9 +1,8 @@
version: "3"
services:
- respondent:
- container_name: respondent
+ respondent_en:
+ container_name: respondent_en
restart: unless-stopped
- image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
- hostname: respondent
+ image: $CI_REGISTRY_IMAGE/eng:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+ hostname: respondent_en
tty: true
-
diff --git a/src/main.tsx b/src/main.tsx
index 197859c..a8ef0cd 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -5,14 +5,14 @@ import { StrictMode, lazy } from "react";
const routes: RouteObject[] = [
{
- path: "/",
+ path: "/en/",
children: [
{
index: true,
element: ,
},
{
- path: ":quizId",
+ path: "/en/:quizId",
element: ,
},
],
diff --git a/vite.config.ts b/vite.config.ts
index ee76c62..a78e917 100644
--- a/vite.config.ts
+++ b/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,
},