Merge pull request #61 from jakowenko/beta

v0.9.0

.develop/Dockerfile.dev

@@ -0,0 +1,29 @@
+FROM node:14-alpine
+RUN apk --update add --no-cache bash python make g++ libpng libpng-dev jpeg-dev pango-dev cairo-dev giflib-dev libheif-dev
+RUN apk add libimagequant-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+RUN apk add vips-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
+
+WORKDIR /double-take/api
+COPY /api/package.json .
+RUN npm install --production
+
+WORKDIR /double-take/frontend
+COPY /frontend/package.json .
+RUN npm install
+
+WORKDIR /double-take/api
+COPY /api/server.js .
+COPY /api/src ./src
+
+WORKDIR /double-take/frontend
+COPY /frontend/src ./src
+COPY /frontend/public ./public
+COPY /frontend/.env.production ./frontend/vue.config.js ./
+
+WORKDIR /
+RUN mkdir /.storage
+RUN ln -s /.storage /double-take/.storage
+
+WORKDIR /double-take
+
+RUN npm install nodemon -g

.develop/entrypoint.dev.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mkdir -p ./.storage/config
+[ -f ./.storage/config/config.yml ] || echo $'# Double Take' > ./.storage/config/config.yml
+exec npm run api

.develop/mosquitto.conf

@@ -0,0 +1,2 @@
+listener 1883
+allow_anonymous true

.dockerignore

@@ -1,5 +1,6 @@
 *
 
+!entrypoint.sh
 !frontend/*
 !api/*
 

.gitignore

@@ -1,6 +1,5 @@
 .DS_Store
 node_modules
-docker-compose.yml
 
 # frontend
 frontend/dist

Dockerfile

@@ -4,21 +4,21 @@ RUN apk add libimagequant-dev --repository=http://dl-cdn.alpinelinux.org/alpine/
 RUN apk add vips-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
 
 WORKDIR /double-take/api
-COPY ./api/package.json .
+COPY /api/package.json .
 RUN npm install --production
 
 WORKDIR /double-take/frontend
-COPY ./frontend/package.json .
+COPY /frontend/package.json .
 RUN npm install
 
 WORKDIR /double-take/api
-COPY ./api/server.js .
-COPY ./api/src ./src
+COPY /api/server.js .
+COPY /api/src ./src
 
 WORKDIR /double-take/frontend
-COPY ./frontend/src ./src
-COPY ./frontend/public ./public
-COPY ./frontend/.env.production ./frontend/vue.config.js ./
+COPY /frontend/src ./src
+COPY /frontend/public ./public
+COPY /frontend/.env.production ./frontend/vue.config.js ./
 
 RUN npm run build
 RUN mv dist /tmp/dist && rm -r * && mv /tmp/dist/* .
@@ -28,8 +28,9 @@ RUN mkdir /.storage
 RUN ln -s /.storage /double-take/.storage
 
 WORKDIR /double-take
-RUN echo "# Double Take\n\n\n" >> config.yml
 
 RUN npm install nodemon -g
 
-CMD nodemon --watch config.yml api/server.js
+COPY /entrypoint.sh .
+
+ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]