From 832efde081a05482989f3a531af6feaeb7222e98 Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Mon, 30 Dec 2019 20:48:25 +0100
Subject: [PATCH] updating docker build

---
 docker/docker-compose/default/docker-compose.yml    | 2 +-
 docker/docker-compose/with-mysql/docker-compose.yml | 2 +-
 gulpfile.ts                                         | 2 +-
 package.json                                        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/docker-compose/default/docker-compose.yml b/docker/docker-compose/default/docker-compose.yml
index 75246c71..dfd442bb 100644
--- a/docker/docker-compose/default/docker-compose.yml
+++ b/docker/docker-compose/default/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   nginx:
     image: nginx:latest
-    container_name: production_nginx
+    container_name: nginx
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/error.log:/etc/nginx/error_log.log
diff --git a/docker/docker-compose/with-mysql/docker-compose.yml b/docker/docker-compose/with-mysql/docker-compose.yml
index fe848595..e177ba5e 100644
--- a/docker/docker-compose/with-mysql/docker-compose.yml
+++ b/docker/docker-compose/with-mysql/docker-compose.yml
@@ -13,7 +13,7 @@ services:
 
   nginx:
     image: nginx:latest
-    container_name: production_nginx
+    container_name: nginx
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/error.log:/etc/nginx/error_log.log
diff --git a/gulpfile.ts b/gulpfile.ts
index b9499334..9619ea66 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -105,7 +105,7 @@ gulp.task('copy-static', function () {
   return gulp.src([
     'src/backend/model/diagnostics/blank.jpg',
     'README.md',
-    'package-lock.json',
+  //  'package-lock.json', should not add, it keeps optional packages optional even with --force-opt-packages.
     'LICENSE'], {base: '.'})
     .pipe(gulp.dest('./release'));
 });
diff --git a/package.json b/package.json
index f985baac..9a8fcfb6 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "jimp": "0.9.3",
     "locale": "0.1.0",
     "reflect-metadata": "0.1.13",
-    "rimraf": "^3.0.0",
+    "rimraf": "3.0.0",
     "sqlite3": "4.1.1",
     "ts-exif-parser": "0.1.4",
     "ts-node-iptc": "1.0.11",
@@ -76,7 +76,7 @@
     "@types/image-size": "0.8.0",
     "@types/jasmine": "3.5.0",
     "@types/node": "12.12.14",
-    "@types/rimraf": "^2.0.3",
+    "@types/rimraf": "2.0.3",
     "@types/sharp": "0.23.1",
     "@types/winston": "2.4.4",
     "@yaga/leaflet-ng2": "1.0.0",