From 56f5db9955cc89a1db7a5d9aadaf26e4055d2a19 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Wed, 22 Sep 2021 17:09:42 +0200
Subject: [PATCH] build: Misc changes in Dockerfiles and package.json
---
Dockerfile | 2 +-
Dockerfile.develop | 34 ++++++++++++++++++++++++++++++++++
package.json | 2 +-
3 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 Dockerfile.develop
diff --git a/Dockerfile b/Dockerfile
index 216e0df..2af40aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN \
https://github.com/Griefed/ltt-mapmaker.git \
/tmp/lttmm && \
cd /tmp/lttmm && \
- npm install -g npm@7.17.0 && \
+ npm install -g npm@7.23.0 && \
npm install -g @quasar/cli && \
npm install && \
quasar build
diff --git a/Dockerfile.develop b/Dockerfile.develop
new file mode 100644
index 0000000..4e378e4
--- /dev/null
+++ b/Dockerfile.develop
@@ -0,0 +1,34 @@
+FROM node:16.9.1-alpine3.13 AS builder
+
+RUN \
+ apk add \
+ git \
+ npm && \
+ git clone \
+ -b develop \
+ https://github.com/Griefed/ltt-mapmaker.git \
+ /tmp/lttmm && \
+ cd /tmp/lttmm && \
+ npm install -g npm@7.23.0 && \
+ npm install -g @quasar/cli && \
+ npm install && \
+ quasar build
+
+FROM lsiobase/nginx:3.14
+
+LABEL maintainer="Griefed <griefed@griefed.de>"
+
+RUN \
+ mkdir -p \
+ /app/lttmm && \
+ echo "**** Cleanup ****" && \
+ rm -rf \
+ /root/.cache \
+ /tmp/*
+
+COPY --from=builder tmp/lttmm/dist/spa/ /app/lttmm
+COPY root/ /
+
+EXPOSE 80 443
+
+VOLUME /config
diff --git a/package.json b/package.json
index c4b6259..77c3926 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "ltt-mapmaker",
"version": "1.1.0",
"description": "Visual Map Maker for Let Them Trade",
- "productName": "Let Them Trade Map Maker",
+ "productName": "Let Them Trade Map-Maker",
"author": "Griefed <griefed@griefed.de>",
"private": true,
"scripts": {
--
GitLab