Merge pull request #54 from m0ngr31/features/package-upgrades

Features/package upgrades

Dockerfile

@@ -5,12 +5,12 @@ WORKDIR /app
 
 COPY . .
 
-RUN apk add build-base libffi-dev shadow
+RUN apk add build-base libffi-dev shadow sudo
 
 RUN \
-  addgroup -g 911 abc && \
-  adduser -D -H -u 911 -G abc abc && \
-  usermod -G users abc
+  useradd -u 911 -U -s /bin/false abc && \
+  usermod -G users abc && \
+  echo "abc ALL=(ALL) ALL" > /etc/sudoers.d/abc && chmod 0440 /etc/sudoers.d/abc
 
 RUN \
   cd /app && \
@@ -22,7 +22,7 @@ RUN \
 RUN \
   cd /app/client && \
   npm ci && \
-  npm install node-sass && \
+  npm rebuild node-sass && \
   npm run build
 
 USER abc

README.md

@@ -7,7 +7,7 @@
   </svg>
 </p>
 
-Current version: **1.0-beta11**
+Current version: **1.0-beta12**
 
 ## About
 The idea for this app came from using my Hobonichi Techo planner every morning to write down what I needed to accomplish that day & using it for scratching down random thoughts and notes as the day went on. The closest thing I've seen to an app for replacing this system is Noteplan, but I don't use a Mac or an iOS device, and it's not self-hostable, so I decided to write my own.

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daily-notes",
-  "version": "1.0.0-beta.11",
+  "version": "1.0.0-beta.12",
   "private": true,
   "license": "MIT",
   "repository": {

client/vue.config.js

@@ -2,7 +2,7 @@ var webpack = require('webpack');
 var path = require('path');
 
 process.env.VUE_APP_PREVENT_SIGNUPS = process.env.PREVENT_SIGNUPS ? true : '';
-process.env.VUE_APP_BASE_URL = process.env.BASE_URL;
+process.env.VUE_APP_BASE_URL = process.env.BASE_URL ? VUE_APP_BASE_URL : '';
 
 module.exports = {
   lintOnSave: false,

run.sh

@@ -4,11 +4,12 @@ PUID=${PUID:-911}
 PGID=${PGID:-911}
 
 if [ "$(whoami)" = "abc" ]; then
-  echo "Setting container permissions"
-  groupmod -o -g "$PGID" abc
-  usermod -o -u "$PUID" abc
-  chown abc:abc /app
-  chown abc:abc /config
+  if [ "$PUID" != 911 ]; then
+    echo "Setting container permissions"
+    sudo groupmod -o -g "$PGID" abc
+    sudo usermod -o -u "$PUID" abc
+    sudo chown -R abc:abc /app
+  fi
 fi
 
 if test -f "./config/.env"; then