From 826242681fe85b3a077f5efad93aa30ff8870761 Mon Sep 17 00:00:00 2001
From: jan <jan.schnaidt@student.reutlingen-university.de>
Date: Mon, 11 Nov 2024 21:53:20 +0100
Subject: [PATCH] Docker funktion
---
Dockerfile | 2 +-
docker-compose.yml | 6 ------
package-lock.json | 6 ++++++
3 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 package-lock.json
diff --git a/Dockerfile b/Dockerfile
index 1d25449..bc8e9c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN npm run build
################################################################
# getting jdk 17 (we use this version in development too)
-FROM eclipse-temurin:17-jdk-alpine AS build-backend
+FROM eclipse-temurin:17.0.7_7-jdk-focal AS build-backend
# working directory for backend
WORKDIR /app
diff --git a/docker-compose.yml b/docker-compose.yml
index c0a1249..88d0df2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,12 +23,6 @@ services:
- ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js
networks:
- todo-network
- # mongo is being initialized too late so we have to wait for it
- healthcheck:
- test: [ "CMD", "mongo", "--eval", "db.adminCommand('ping')" ]
- interval: 10s
- timeout: 5s
- retries: 5
# backend stuff
backend:
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..5e0eba1
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "todo-app-jan-schnaidt-and-abdullah-kiran",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
--
GitLab