From 0b8f2c75571afa40d2c73ee9fb62d491852992d7 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Wed, 26 Jan 2022 19:45:34 +0300 Subject: [PATCH] test cicd --- .gitlab-ci.yml | 3 +-- gitlab-app/{Dockerfile-linux => Dockerfile} | 7 +++--- gitlab-app/Dockerfile-linux2 | 24 --------------------- gitlab-app/Dockerfile-mac | 20 ----------------- 4 files changed, 4 insertions(+), 50 deletions(-) rename gitlab-app/{Dockerfile-linux => Dockerfile} (89%) delete mode 100644 gitlab-app/Dockerfile-linux2 delete mode 100644 gitlab-app/Dockerfile-mac diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d099538..d91987c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,8 +31,7 @@ docker-build: script: - cd gitlab-app - docker buildx create --use - - docker buildx build --push --platform linux/amd64 -f Dockerfile-linux -t "upagge/test:latest" . - - docker buildx build --push --platform linux/arm64/v8 -f Dockerfile-linux2 -t "upagge/test:latest" . + - docker buildx build --push --platform linux/amd64,linux/arm64/v8 -f Dockerfile-linux -t "upagge/test:latest" . # - docker push "$CI_REGISTRY_IMAGE:latest" # - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" diff --git a/gitlab-app/Dockerfile-linux b/gitlab-app/Dockerfile similarity index 89% rename from gitlab-app/Dockerfile-linux rename to gitlab-app/Dockerfile index b62fa23..f39ad6a 100644 --- a/gitlab-app/Dockerfile-linux +++ b/gitlab-app/Dockerfile @@ -1,8 +1,7 @@ -FROM openjdk:17-alpine3.14 +FROM openjdk:17.0.2-jdk-slim-buster MAINTAINER uPagge -RUN apk add --no-cache bash && \ - addgroup -S gitlabbot && \ - adduser -S gitlabbot -G gitlabbot && \ +RUN addgroup gitlabbot --disabled-password && \ + adduser gitlabbot --ingroup gitlabbot && \ mkdir -p /bot && \ chown -R gitlabbot:gitlabbot /bot WORKDIR /bot diff --git a/gitlab-app/Dockerfile-linux2 b/gitlab-app/Dockerfile-linux2 deleted file mode 100644 index 5936ad2..0000000 --- a/gitlab-app/Dockerfile-linux2 +++ /dev/null @@ -1,24 +0,0 @@ -FROM openjdk:17-jdk-oraclelinux8 -MAINTAINER uPagge -RUN apk add --no-cache bash && \ - addgroup -S gitlabbot && \ - adduser -S gitlabbot -G gitlabbot && \ - mkdir -p /bot && \ - chown -R gitlabbot:gitlabbot /bot -WORKDIR /bot -USER gitlabbot:gitlabbot -COPY target/gitlab-notification.jar app.jar -ENV TELEGRAM_PERSON_ID=TELEGRAM_PERSON_ID DATASOURCE_URL=DATASOURCE_URL \ - DATASOURCE_PASSWORD=DATASOURCE_PASSWORD DATASOURCE_USERNAME=DATASOURCE_USERNAME \ - GITLAB_PERSONAL_TOKEN=GITLAB_PERSONAL_TOKEN TELEGRAM_BOT_TOKEN=TELEGRAM_BOT_TOKEN \ - TELEGRAM_BOT_USERNAME=TELEGRAM_BOT_USERNAME GITLAB_URL=GITLAB_URL GITLAB_REPLACE_URL=GITLAB_REPLACE_URL -ENTRYPOINT java -DTELEGRAM_BOT_USERNAME=${TELEGRAM_BOT_USERNAME} \ - -DTELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN \ - -DTELEGRAM_PERSON_ID=$TELEGRAM_PERSON_ID \ - -DDATASOURCE_URL=$DATASOURCE_URL \ - -DDATASOURCE_PASSWORD=$DATASOURCE_PASSWORD \ - -DDATASOURCE_USERNAME=$DATASOURCE_USERNAME \ - -DGITLAB_PERSONAL_TOKEN=$GITLAB_PERSONAL_TOKEN \ - -DGITLAB_URL=$GITLAB_URL \ - -DGITLAB_REPLACE_URL=$GITLAB_REPLACE_URL \ - -jar app.jar \ No newline at end of file diff --git a/gitlab-app/Dockerfile-mac b/gitlab-app/Dockerfile-mac deleted file mode 100644 index c327fcf..0000000 --- a/gitlab-app/Dockerfile-mac +++ /dev/null @@ -1,20 +0,0 @@ -FROM upagge/openjdk-mac-slim:17.0.2 -MAINTAINER uPagge -RUN mkdir -p /bot && adduser gitlabbot --disabled-password && chown -R gitlabbot:gitlabbot /bot -WORKDIR /bot -USER gitlabbot:gitlabbot -COPY target/gitlab-notification.jar app.jar -ENV TELEGRAM_PERSON_ID=TELEGRAM_PERSON_ID DATASOURCE_URL=DATASOURCE_URL \ - DATASOURCE_PASSWORD=DATASOURCE_PASSWORD DATASOURCE_USERNAME=DATASOURCE_USERNAME \ - GITLAB_PERSONAL_TOKEN=GITLAB_PERSONAL_TOKEN TELEGRAM_BOT_TOKEN=TELEGRAM_BOT_TOKEN \ - TELEGRAM_BOT_USERNAME=TELEGRAM_BOT_USERNAME GITLAB_URL=GITLAB_URL GITLAB_REPLACE_URL=GITLAB_REPLACE_URL -ENTRYPOINT java -DTELEGRAM_BOT_USERNAME=${TELEGRAM_BOT_USERNAME} \ - -DTELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN \ - -DTELEGRAM_PERSON_ID=$TELEGRAM_PERSON_ID \ - -DDATASOURCE_URL=$DATASOURCE_URL \ - -DDATASOURCE_PASSWORD=$DATASOURCE_PASSWORD \ - -DDATASOURCE_USERNAME=$DATASOURCE_USERNAME \ - -DGITLAB_PERSONAL_TOKEN=$GITLAB_PERSONAL_TOKEN \ - -DGITLAB_URL=$GITLAB_URL \ - -DGITLAB_REPLACE_URL=$GITLAB_REPLACE_URL \ - -jar app.jar \ No newline at end of file