Merge branch 'new_baseimage' into 'master'

changed to new base image

See merge request !25

.gitlab-ci.yml

-# This file is a template, and might need editing before it works on your project.
-# Official docker image.
-image: docker:latest
-
-variables:
-  DOCKER_DRIVER: overlay2
-  DOCKER_TLS_CERTDIR: ""
-
-services:
-  - docker:19.03.1-dind
-
-before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
-build-master:
-  stage: build
-  script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
-    - docker push "$CI_REGISTRY_IMAGE"
-  only:
-    - master
-
-build:
-  stage: build
-  script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-  except:
-    - master
+include:
+  - project: 'histhub/node-kafka-docker-base'
+    ref: 'master'
+    file: '.gitlab-ci.yml'

Dockerfile

-FROM node:10-slim
-
-# add basic libs
-RUN apt-get update && apt-get install -y  \
-      bash \
-      g++ \
-      gcc \
-      ca-certificates \
-      make \
-      python \
-      bash \
-      git
-
-
-# Create app directory
-RUN mkdir -p /usr/local/app
-
-# Move to the app directory
-WORKDIR /usr/local/app
+FROM source.dodis.ch:4577/histhub/node-kafka-docker-base:latest
 
 # copy app to the container
 COPY package.json package-lock.json config.json tsconfig.json /usr/local/app/

package.json

@@ -16,9 +16,7 @@
   "license": "ISC",
   "dependencies": {
     "@types/express": "^4.16.0",
-    "@types/node": "^9.6.21",
     "@types/superagent": "^3.8.0",
-    "@types/winston": "^2.3.9",
     "boom": "^7.3.0",
     "concurrently": "^3.5.1",
     "cors": "^2.8.4",
@@ -32,9 +30,7 @@
     "node-cache": "^4.2.0",
     "sha.js": "^2.4.11",
     "source-map-support": "^0.5.6",
-    "supertest": "^3.1.0",
-    "typescript": "^2.8.3",
-    "winston": "^2.4.2"
+    "supertest": "^3.1.0"
   },
   "devDependencies": {
     "@types/boom": "^7.2.1",