From f9e2d2058b62f2d2815b25b9cb0471a97606b322 Mon Sep 17 00:00:00 2001
From: Stefan Saenger <stefan.saenger@vnc.biz>
Date: Wed, 28 Jun 2023 06:36:13 +0200
Subject: [PATCH] fix: image build

---
 .gitlab-ci.yml    | 28 ++++------------------------
 Dockerfile        | 20 ++++++++++++--------
 Dockerfile.ubuntu | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 Dockerfile.ubuntu

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fce5c36..6fbdd5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: docker:19.03.1
+image: docker:20.10.17
 
 variables:
   DOCKER_HOST: tcp://localhost:2375
@@ -9,36 +9,16 @@ variables:
   IMAGE_TAG_STABLE: eu.gcr.io/vnc-stable/vnc-avatar:stable
 
 services:
-  - docker:19.03.1-dind
+  - name: docker:20.10.17-dind
+    alias: docker
 
 stages:
-  - build_deb
   - docker
   - notification
 
-build-and-push-deb-package:
-  image: eu.gcr.io/vnc-development/docker-vnc-deb-builder:latest
-  stage: build_deb
-  script:
-    - yarn install
-    - git fetch --tags
-    - makechangelog.uxf > debian/changelog && cat debian/changelog
-    - cat debian/changelog
-    - mkdir src
-    - sed -n 1p debian/changelog | grep -oP '\(.*?\)' > src/version.txt
-    - echo '####################################################'
-    - cat src/version.txt
-    - echo '####################################################'
-    - cd debian; debuild --check-dirname-level 0 --no-tgz-check --no-lintian -us -uc; cd ..
-    # - scp ../*.deb repo@factorypackages.rz.vnc.biz:/srv/repo/apt/incoming/
-    # - ssh repo@factorypackages.rz.vnc.biz /srv/repo/bin/import-new-packages.sh
-    - scp ../*.deb repo@34.89.202.54:/srv/repo/apt/incoming/
-    - ssh repo@34.89.202.54 /srv/repo/bin/import-new-packages.sh
-  only:
-    - master
-
 dev_deploy:  
   before_script:
+    - until docker info; do sleep 1; done    
     - base64 -d $SA_Development | docker login -u _json_key --password-stdin https://eu.gcr.io
   stage: docker
   script:
diff --git a/Dockerfile b/Dockerfile
index 82037e3..20475fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,21 @@
-FROM  eu.gcr.io/vnc-development/docker-vnc-base:latest
+FROM alpine:3.13
 
-RUN apt-get update
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get install -y nodejs
-RUN apt-get install -y build-essential
-RUN npm install -g serve
-RUN npm install pm2 -g
+RUN apk update
+RUN apk upgrade
+RUN apk add make gcc python3 expat expat-dev libxmlb-dev libstdc++6 nodejs nodejs-dev libc-dev g++ yarn graphicsmagick graphicsmagick-dev
+
+RUN mkdir -p /usr/share/vnc-avatar
+ADD app /usr/share/vnc-avatar
+COPY package.json /usr/share/vnc-avatar/package.json
+
+RUN yarn global add node-gyp
+RUN cd /usr/share/vnc-avatar && yarn install
 
-RUN apt-get install -y vnc-avatarservice
 COPY config/vnc-avatarservice.js /usr/share/vnc-avatar/config/vnc-avatarservice.js
 
 # Folder to store the Avatars
 RUN mkdir /var/opt/out
 
+RUN yarn global add pm2
 
 ENTRYPOINT ["pm2-runtime", "/usr/share/vnc-avatar/app/app.js"]
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
new file mode 100644
index 0000000..82037e3
--- /dev/null
+++ b/Dockerfile.ubuntu
@@ -0,0 +1,17 @@
+FROM  eu.gcr.io/vnc-development/docker-vnc-base:latest
+
+RUN apt-get update
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN apt-get install -y nodejs
+RUN apt-get install -y build-essential
+RUN npm install -g serve
+RUN npm install pm2 -g
+
+RUN apt-get install -y vnc-avatarservice
+COPY config/vnc-avatarservice.js /usr/share/vnc-avatar/config/vnc-avatarservice.js
+
+# Folder to store the Avatars
+RUN mkdir /var/opt/out
+
+
+ENTRYPOINT ["pm2-runtime", "/usr/share/vnc-avatar/app/app.js"]