refactor ci script

.gitlab-ci.yml

@@ -1,13 +1,25 @@
 stages:
-    - check
     - build
     - deploy
 
-include:
+variables:
-    - project: dockerized/commons
+        IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
-      ref: master
-      file: gitlab-ci-template.yml
 
+build:
+    image: registry.hottis.de/dockerized/docker-bash:latest
+    stage: build
+    tags:
+        - hottis
+        - linux
+        - docker
+    script: 
+        - docker build --tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} .
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
+        - docker push $IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
+        - if [ "$CI_COMMIT_TAG" != "" ]; then
+            docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $IMAGE_NAME:${CI_COMMIT_TAG};
+            docker push $IMAGE_NAME:${CI_COMMIT_TAG};
+          fi
 deploy:
     image: registry.hottis.de/dockerized/docker-bash:latest
     stage: deploy
@@ -23,5 +35,14 @@ deploy:
     script:
         - docker stop $CONTAINER_NAME || echo "container not running, never mind"
         - docker rm $CONTAINER_NAME || echo "container not existing, never mind"
-        - docker run -d --network docker-server --ip 172.16.10.42 -v sink_config:/etc/sink --name $CONTAINER_NAME --restart always $IMAGE_NAME:$CI_COMMIT_TAG
+        - docker run 
+          -d 
+          --network docker-server 
+          --ip 172.16.10.42 
+          -v sink_config:/etc/sink 
+          --name $CONTAINER_NAME 
+          --restart always 
+          $IMAGE_NAME:$CI_COMMIT_TAG
+    environment:
+        name: production
 

schema/createSchema.sql

@@ -1,9 +0,0 @@
-CREATE SEQUENCE device_s START WITH 1 INCREMENT BY 1;
-
-CREATE TABLE device_t (
-    id integer PRIMARY KEY DEFAULT NEXTVAL('device_s'),
-    deviceid varchar(16) UNIQUE NOT NULL,
-    sharedsecret varchar(31) NOT NULL CHECK(char_length(sharedSecret) = 31),
-    location varchar(128) NOT NULL,
-    active boolean NOT NULL DEFAULT false
-);

sink/sink20169.c

@@ -367,7 +367,7 @@ int main(int argc, char **argv) {
     bool doFork = false;
 
     int c;
-    while ((c = getopt(argc, argv, "f:vs:hn:b")) != -1) {
+    while ((c = getopt(argc, argv, "f:vds:hn:b")) != -1) {
         switch (c) {
             case 'f':
                 configFilename = strdup(optarg);