From 646f16d364818ce11928f0012c67c1ba4bb011e3 Mon Sep 17 00:00:00 2001
From: Travis Shivers <ttshivers@gmail.com>
Date: Mon, 27 Jul 2020 18:31:04 -0500
Subject: [PATCH] Made publicPath relative to support all base urls without
 rebuilding

---
 .github/workflows/docker-subfolder.yml | 89 --------------------------
 Dockerfile                             |  4 --
 src/router/index.js                    |  1 -
 vue.config.js                          |  3 +-
 4 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 .github/workflows/docker-subfolder.yml

diff --git a/.github/workflows/docker-subfolder.yml b/.github/workflows/docker-subfolder.yml
deleted file mode 100644
index 7761c4fa..00000000
--- a/.github/workflows/docker-subfolder.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-name: Docker Subfolder
-
-on:
-  push:
-    branches: master
-    tags:
-      - v*
-
-jobs:
-  buildx:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-
-      - name: get-npm-version
-        id: package-version
-        uses: martinbeentjes/npm-get-version-action@master
-
-      -
-        name: Prepare
-        id: prepare
-        run: |
-          DOCKER_IMAGE=ttshivers/synclounge
-          DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x
-          VERSION=latest
-          BASE_URL="/synclounge"
-          SOURCE_BRANCH=${GITHUB_REF#refs/heads/}
-
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
-          fi
-
-          VERSION="${VERSION}-subfolder"
-
-          TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
-
-          echo ::set-output name=docker_image::${DOCKER_IMAGE}
-          echo ::set-output name=version::${VERSION}
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
-            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
-            --build-arg REVISION=${GITHUB_SHA:0:7} \
-            --build-arg SOURCE_BRANCH=${SOURCE_BRANCH} \
-            --build-arg VERSION=${{ steps.package-version.outputs.current-version}} \
-            --build-arg BASE_URL=${BASE_URL} \
-            --cache-from "type=local,src=/tmp/.buildx-cache" \
-            --cache-to "type=local,dest=/tmp/.buildx-cache" \
-            ${TAGS} --file ./Dockerfile ./
-      -
-        name: Set up Docker Buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
-      -
-        name: Cache Docker layers
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      -
-        name: Docker Buildx (build)
-        run: |
-          docker buildx build \
-            --output "type=image,push=false" \
-            ${{ steps.prepare.outputs.buildx_args }}
-      -
-        name: Docker Login
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: |
-          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
-      -
-        name: Docker Buildx (push)
-        run: |
-          docker buildx build \
-            --output "type=image,push=true" \
-            ${{ steps.prepare.outputs.buildx_args }}
-      -
-        name: Docker Check Manifest
-        run: |
-          docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
-      -
-        name: Clear
-        if: always()
-        run: |
-          rm -f ${HOME}/.docker/config.json
diff --git a/Dockerfile b/Dockerfile
index f286da92..52d54ce7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,6 @@ COPY . .
 ARG SERVERS='[{"name":"Local Server","location":"Local","url":"","image":"synclounge-white.png"}]'
 ARG SOURCE_BRANCH
 ARG REVISION
-ARG BASE_URL
 
 RUN npm run build
 
@@ -42,7 +41,4 @@ LABEL org.opencontainers.image.version=$VERSION
 LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.documentation="https://docs.synclounge.tv/"
 
-
-ARG BASE_URL
-ENV BASE_URL ${BASE_URL}
 ENTRYPOINT ["./docker-entrypoint.sh"]
diff --git a/src/router/index.js b/src/router/index.js
index ebd3bbf9..5081b82c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,7 +7,6 @@ Vue.use(Router);
 
 // ==================== Router registration ====================
 export default new Router({
-  base: process.env.BASE_URL,
   mode: 'hash',
   routes: [
     {
diff --git a/vue.config.js b/vue.config.js
index 07e8c9a5..22976dc1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,11 +24,12 @@ try {
 }
 
 module.exports = {
+  // Relative publicPath to support subfolders
+  publicPath: '',
   lintOnSave: process.env.NODE_ENV !== 'production',
   productionSourceMap: false,
   transpileDependencies: ['vuetify'],
   configureWebpack: {
-    devtool: process.env.NODE_ENV === 'production' ? false : 'cheap-eval-source-map',
     resolve: {
       alias: {
         // Alias @ to /src folder for ES/TS imports