From fd98ab22cf7d7b8fc23b2a6e3d7a4f52339ae1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Mon, 25 Oct 2021 18:36:26 +0200
Subject: [PATCH] Version up

---
 .gitlab-ci.yml | 15 +++++++--------
 Dockerfile     |  6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7717c76..2763d76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,11 @@
-image: docker:19.03.1
+image: docker:19.03.12
 
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
-  IMAGE_TAG: $CI_REGISTRY_IMAGE
-  IMAGE_VER: 1.19.5
+  IMAGE_VER: 1.19.10-1
 
 services:
-  - docker:19.03.1-dind
+  - docker:19.03.12-dind
 
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -14,7 +13,7 @@ before_script:
 build:
   stage: build
   script:
-    - 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
+    - docker pull $CI_REGISTRY_IMAGE:latest || true
+    - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$IMAGE_VER --tag $CI_REGISTRY_IMAGE:latest .
+    - docker push $CI_REGISTRY_IMAGE:$IMAGE_VER
+    - docker push $CI_REGISTRY_IMAGE:latest
diff --git a/Dockerfile b/Dockerfile
index f5be5b2..f9bf11e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG NGINX_VERSION=1.19.5
-ARG NGINX_RTMP_VERSION=1.2.1
-ARG FFMPEG_VERSION=4.3.1
+ARG NGINX_VERSION=1.19.10
+ARG NGINX_RTMP_VERSION=1.2.2
+ARG FFMPEG_VERSION=4.3.3
 
 
 ##############################
-- 
GitLab