solve merge conflicts

nfdi4health · Jul 20, 2023 · 5b23106 · 5b23106
2 parents 7045fa8 + 63c3fa3
commit 5b23106
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13,406 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,8 +2,9 @@ version: "2.2"
 services:
   frontend:
     # uncomment for local dev
-    build: ./frontend
+#    build: ./frontend
     restart: always
+#    image: github.com/nfdi4health/metadata-annotation-workbench/frontend:${VERSION}
     image: gitlab.zbmed.de:5050/km/nfdi4health/annotation-workbench/frontend:${VERSION}
 
     environment:
@@ -17,19 +18,17 @@ services:
 
   backend:
     # uncomment for local dev
-    build: ./backend
+#    build: ./backend
     restart: always
-    image: gitlab.zbmed.de:5050/km/nfdi4health/annotation-workbench/backend:${VERSION}
+#    image: github.com/nfdi4health/metadata-annotation-workbench:${VERSION}
+    image: gitlab.zbmed.de:5050/km/nfdi4health/annotation-workbench/frontend:${VERSION}
     expose:
       - "5000"
     environment:
       - PYTHONPATH=/workspace
       - API_SEMLOOKP=https://semanticlookup.zbmed.de/ols/api/
       - API_OLS=https://www.ebi.ac.uk/ols/api/
-#      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
-      - DB_USERNAME=postgres
-      - DB_PASSWORD=postgres
-      - DB_HOST=db
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
       - INSTRUMENTS=/var/lib/mda/instruments
     depends_on:
       - db

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -3,7 +3,7 @@ FROM node:16.13.1-alpine as build-deps
 WORKDIR /usr/src/app
 ARG NPM_TOKEN
 COPY .npmrc .npmrc
-COPY package.json yarn.lock ./
+COPY package.json package-lock.json ./
 RUN npm install
 COPY ./ ./
 RUN npm run build