From 01e13d7b5a778c218af53b779757e945591e2af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Wed, 4 Nov 2020 01:16:22 +0100
Subject: [PATCH] Nova verze, nove pluginy

---
 .gitlab-ci.yml | 9 ++++++---
 Dockerfile     | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b09b14..a00e2b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,8 @@ image: docker:19.03.1
 
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
-  IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
+  IMAGE_TAG: $CI_REGISTRY_IMAGE
+  IMAGE_VER: 3.3.6
 
 services:
   - docker:19.03.1-dind
@@ -13,5 +14,7 @@ before_script:
 build:
   stage: build
   script:
-    - docker build -t $IMAGE_TAG .
-    - docker push $IMAGE_TAG
+    - docker build -t $IMAGE_TAG:$IMAGE_VER .
+    - docker tag $IMAGE_TAG:$IMAGE_VER $IMAGE_TAG:latest
+    - docker push $IMAGE_TAG:$IMAGE_VER
+    - docker push $IMAGE_TAG:latest
diff --git a/Dockerfile b/Dockerfile
index 9c596d5..fbf685c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
-FROM graylog/graylog:3.3.5
+FROM graylog/graylog:3.3.6
 MAINTAINER Andrej Ramašeuski <andrej.ramaseuski@pirati.cz>
 RUN curl -L -o /usr/share/graylog/plugin/graylog-plugin-auth-sso-3.3.0.jar https://github.com/Graylog2/graylog-plugin-auth-sso/releases/download/3.3.0/graylog-plugin-auth-sso-3.3.0.jar
+RUN curl -L -o /usr/share/graylog/plugin/graylog-output-syslog-3.3.0.jar https://github.com/wizecore/graylog2-output-syslog/releases/download/3.3.0/graylog-output-syslog-3.3.0.jar
+RUN curl -L -o /usr/share/graylog/plugin/graylog-plugin-matomo-0.0.3.jar https://github.com/petzah/graylog-plugin-matomo/releases/download/v0.0.3/graylog-plugin-matomo-0.0.3.jar
-- 
GitLab