From 72b38e5ac6a899ad44a5bcd50dc64e127c8e32a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karlo=20Miku=C5=A1?= Date: Fri, 24 Feb 2023 15:23:59 +0100 Subject: [PATCH 1/3] Update workflows --- .github/workflows/build-dev-image.yml | 8 +++--- .github/workflows/build-image.yml | 8 +++--- .github/workflows/build-legacy-image.yml | 34 ++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/build-legacy-image.yml diff --git a/.github/workflows/build-dev-image.yml b/.github/workflows/build-dev-image.yml index 26bc0623..d99daa95 100644 --- a/.github/workflows/build-dev-image.yml +++ b/.github/workflows/build-dev-image.yml @@ -1,4 +1,4 @@ -name: Build DEV docker image +name: Build unstable docker image on: push: @@ -22,8 +22,8 @@ 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 @@ -31,6 +31,6 @@ jobs: 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 diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 9758c092..9012161c 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -1,4 +1,4 @@ -name: Build docker image +name: Build stable docker image on: push: @@ -22,8 +22,8 @@ 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 @@ -31,4 +31,4 @@ jobs: 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}} diff --git a/.github/workflows/build-legacy-image.yml b/.github/workflows/build-legacy-image.yml new file mode 100644 index 00000000..5b732895 --- /dev/null +++ b/.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}} From 70d2f172f9d08e19abb0f6d55fe0660763a3899a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karlo=20Miku=C5=A1?= Date: Fri, 24 Feb 2023 15:47:26 +0100 Subject: [PATCH 2/3] Update readme --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 370c11a6..faaa3dd1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Docker image + Docker image License Build

@@ -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 From d39904509e395839d1cc1420a54c35e6bd7b3dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karlo=20Miku=C5=A1?= Date: Fri, 24 Feb 2023 17:39:38 +0100 Subject: [PATCH 3/3] Bump version --- CHANGELOG.md | 4 ++++ package.json | 2 +- src/main.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50938d69..51eba1f8 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/package.json b/package.json index 2a1517c2..f8a15138 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-salt-rim", - "version": "1.5.1", + "version": "1.6.0", "scripts": { "dev": "vite", "build": "vite build", diff --git a/src/main.js b/src/main.js index 50f85b22..3376cc30 100644 --- a/src/main.js +++ b/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)