From 8207e339aa1a9f50364ee7215d3fccc6572c5d49 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <git@upagge.ru>
Date: Wed, 26 Jan 2022 10:59:40 +0300
Subject: [PATCH] release-0.0.6

---
 .gitlab-ci.yml                            | 6 +++---
 gitlab-app/Dockerfile-linux               | 2 +-
 gitlab-app/{Dockerfile => Dockerfile-mac} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename gitlab-app/{Dockerfile => Dockerfile-mac} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41bf81b..fcf1d6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: maven:3.8.4-openjdk-11
+image: maven:3.8.4-openjdk-17
 variables:
   MAVEN_OPTS: "-Dmaven.repo.local=./.m2/repository"
 
@@ -30,7 +30,7 @@ docker-build-master:
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
   script:
-    - cd publisher-telegram
-    - docker build --no-cache -t "$CI_REGISTRY_IMAGE:latest" . -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - cd gitlab-app
+    - docker build --no-cache -f Docker-linux -t "$CI_REGISTRY_IMAGE:latest" . -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
     - docker push "$CI_REGISTRY_IMAGE:latest"
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
\ No newline at end of file
diff --git a/gitlab-app/Dockerfile-linux b/gitlab-app/Dockerfile-linux
index 6067cba..93c937c 100644
--- a/gitlab-app/Dockerfile-linux
+++ b/gitlab-app/Dockerfile-linux
@@ -1,4 +1,4 @@
-FROM upagge/openjdk-mac-slim:17.0.2
+FROM openjdk:17-alpine3.14
 MAINTAINER uPagge <me@upagge.ru>
 RUN apk add --no-cache bash && \
     addgroup -S gitlabbot && \
diff --git a/gitlab-app/Dockerfile b/gitlab-app/Dockerfile-mac
similarity index 100%
rename from gitlab-app/Dockerfile
rename to gitlab-app/Dockerfile-mac