Update run.sh

bmegyesi · Mar 18, 2024 · f316ee7 · f316ee7
1 parent 87d3ccd
commit f316ee7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,6 +31,7 @@ services:
       MYSQL_USER: swegram
       MYSQL_PASSWORD: swegram_pass
       MYSQL_HOST: 172.18.0.1
+      PRODUCTION: 1
     ports:
       - "8000:8000"
     entrypoint: >

diff --git a/frontend/src/components/Common/TextSelector.vue b/frontend/src/components/Common/TextSelector.vue
@@ -214,7 +214,7 @@ export default {
         localStorage.setItem('metadata', JSON.stringify({ en: {}, sv: {} }));
       }
       axios
-        .put(`/api/texts/${this.$route.params.toolVersion}`, {
+        .put(`/api/texts/${lang}`, {
           texts: JSON.parse(localStorage.textList)[lang],
           metadata: JSON.parse(localStorage.metadata)[lang],
         })

diff --git a/frontend/src/main.js b/frontend/src/main.js
@@ -25,7 +25,10 @@ axios.defaults.xsrfCookieName = 'csrftoken';
 
 const router = new VueRouter({
   routes: [
-    { path: '/', redirect: '/en'},
+    {
+      path: '/',
+      redirect: '/en',
+    },
     {
       path: '/:toolVersion(en|sv)',
       component: MainPage,

diff --git a/run.sh b/run.sh
@@ -1,5 +1,8 @@
 #!/bin/bash -e
 
+#clean up possible old containers
+docker compose --profile client down
+
 BASE_PATH=$(pwd)
 FRONTEND_PATH="$BASE_PATH/frontend"
 
@@ -10,10 +13,6 @@ docker build --network host -t vue-builder -f Dockerfile.build .
 # run vue-builder image to create dist
 docker run --rm -v $FRONTEND_PATH/dist:/root/dist vue-builder
 
-# Create swegram-backend image
-cd $BASE_PATH
-docker build --network host -t swegram-backend .
-
 # Start the containers with help of docker compose
 # remove data (mysql container generates data folder)
-docker compose --profile client up -d
+docker compose --profile client up -d --build