Merge pull request #56 from karlomikus/develop

Move docker image

.github/workflows/build-dev-image.yml

@@ -1,4 +1,4 @@
-name: Build DEV docker image
+name: Build unstable docker image
 
 on:
   push:
@@ -22,15 +22,15 @@ jobs:
         name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.HUB_BASS_USERNAME }}
+          password: ${{ secrets.HUB_BASS_TOKEN }}
       -
         name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: kmikus12/salt-rim:dev
+          tags: barassistant/salt-rim:dev
           cache-from: type=gha
           cache-to: type=gha,mode=max

.github/workflows/build-image.yml

@@ -1,4 +1,4 @@
-name: Build docker image
+name: Build stable docker image
 
 on:
   push:
@@ -22,13 +22,13 @@ jobs:
         name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.HUB_BASS_USERNAME }}
+          password: ${{ secrets.HUB_BASS_TOKEN }}
       -
         name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: kmikus12/salt-rim:latest, kmikus12/salt-rim:${{github.ref_name}}
+          tags: barassistant/salt-rim:latest, barassistant/salt-rim:${{github.ref_name}}

.github/workflows/build-legacy-image.yml

@@ -0,0 +1,34 @@
+name: Build legacy docker image
+
+on:
+  push:
+    tags:
+      - 'v1.5.*'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: kmikus12/salt-rim:latest, kmikus12/salt-rim:${{github.ref_name}}

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v1.6.0
+
+Official docker image moved to `barassistant/salt-rim`.
+
 # v1.5.1
 ## Fixes
 - Fix pagination when there is a lot of data

README.md

@@ -3,7 +3,7 @@
 </p>
 
 <p align="center">
-    <a href="https://hub.docker.com/r/kmikus12/salt-rim"><img src="https://img.shields.io/docker/v/kmikus12/salt-rim?style=for-the-badge&sort=semver" alt="Docker image"></a>
+    <a href="https://hub.docker.com/r/barassistant/salt-rim"><img src="https://img.shields.io/docker/v/barassistant/salt-rim?style=for-the-badge&sort=semver" alt="Docker image"></a>
     <img src="https://img.shields.io/github/license/karlomikus/vue-salt-rim?style=for-the-badge" alt="License">
     <img src="https://img.shields.io/github/actions/workflow/status/karlomikus/vue-salt-rim/build-image.yml?style=for-the-badge" alt="Build">
 </p>
@@ -31,6 +31,10 @@ Salt Rim is a web client used for connecting to your [Bar Assistant](https://git
 - Support for markdown in cocktails and ingredients
 - Automatically add missing ingredients to your shopping cart
 
+## Documentation
+
+[Official documentation is available here.](https://bar-assistant.github.io/docs/)
+
 ## Docker installation
 
 Once you have your BA api instance running, you just need to set `API_URL` env variable:
@@ -39,8 +43,9 @@ Once you have your BA api instance running, you just need to set `API_URL` env v
 $ docker run -d \
     --name salt-rim \
     -e API_URL=http://your-bar-assistant-url \
+    -e MEILISEARCH_URL=http://your-meilisearch-url \
     -p 8080:8080 \
-    kmikus12/salt-rim
+    barassistant/salt-rim
 ```
 
 [For a complete docker compose setup click here](https://github.com/bar-assistant/docker/).
@@ -62,7 +67,8 @@ Create a new config file in `public/config.js`, with the following content
 
 ``` js
 window.srConfig = {}
-window.srConfig.API_URL = "http://YOUR_BA_API_URL"
+window.srConfig.API_URL = "$API_URL"
+window.srConfig.MEILISEARCH_URL = "$MEILISEARCH_URL"
 ```
 
 4. Run the build commands

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-salt-rim",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

src/main.js

@@ -7,7 +7,7 @@ import './assets/main.css'
 
 const app = createApp(App)
 
-app.config.globalProperties.app_version = 'v1.5.1';
+app.config.globalProperties.app_version = 'v1.6.0';
 
 app.use(router)
 app.use(InstantSearch)