From 9a4b00e590f7398f0bc4512d834095bb70c8428f Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Tue, 23 Mar 2021 15:28:03 +0200 Subject: [PATCH 1/8] trigger build --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5390fb3..e7ff857 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +#test FROM alpine:3.10.3 RUN apk add --no-cache git~=2.22 bash openssh From d4685af425bc882d569846fd7efeefa86ce5a892 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Tue, 23 Mar 2021 15:44:31 +0200 Subject: [PATCH 2/8] trigger build --- Dockerfile | 2 +- service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7ff857..cb2a5ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #test -FROM alpine:3.10.3 +FROM alpine:3.12.4 RUN apk add --no-cache git~=2.22 bash openssh diff --git a/service.yaml b/service.yaml index 411d6f4..fd14452 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 10.0.3 +version: 10.0.4 From f6624f9603665471b29a37295aa8ab3741c79b2d Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Tue, 23 Mar 2021 16:01:34 +0200 Subject: [PATCH 3/8] bump --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index fd14452..b1d9c0f 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 10.0.4 +version: 10.0.5 From a30accfd3f7306a5ecb5668c6a8ece43ba3526f9 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Tue, 23 Mar 2021 16:07:49 +0200 Subject: [PATCH 4/8] fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb2a5ae..974babc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ #test FROM alpine:3.12.4 -RUN apk add --no-cache git~=2.22 bash openssh +RUN apk add --no-cache git~=2.31 bash openssh # install git-lfs RUN apk add --no-cache --virtual deps openssl && \ From 8145fff2bde41b917b8d5ae8228b55ecdd47ebec Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Tue, 23 Mar 2021 16:13:31 +0200 Subject: [PATCH 5/8] fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 86335e4..188551a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ #test FROM alpine:3.12.4 -RUN apk add --no-cache git~=2.31 bash openssh +RUN apk add --no-cache git bash openssh # install git-lfs RUN apk add --no-cache --virtual deps openssl && \ From 97e7b4c1d5838daab488f66bb6e2595bf3c81f37 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Wed, 24 Mar 2021 12:09:32 +0200 Subject: [PATCH 6/8] fix --- Dockerfile | 1 - Dockerfile.aarch64 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 188551a..1bc171a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ -#test FROM alpine:3.12.4 RUN apk add --no-cache git bash openssh diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c65044e..2337977 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.7 +FROM arm64v8/alpine:3.12.4 RUN apk add --no-cache git bash openssh # install git-lfs From 8c577556673708269bc11be310ad3189ecd415e0 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Wed, 24 Mar 2021 13:41:25 +0200 Subject: [PATCH 7/8] fix according to the comments --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1bc171a..94e7046 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12.4 -RUN apk add --no-cache git bash openssh +RUN apk add --no-cache git=~2.26.3 bash openssh # install git-lfs RUN apk add --no-cache --virtual deps openssl && \ From f270ebccaffc5cec7d77577890398fa7453c3df4 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Wed, 24 Mar 2021 14:33:00 +0200 Subject: [PATCH 8/8] remove aarch dockerfile --- Dockerfile.aarch64 | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 Dockerfile.aarch64 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index 2337977..0000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,22 +0,0 @@ -FROM arm64v8/alpine:3.12.4 -RUN apk add --no-cache git bash openssh - -# install git-lfs -RUN apk add --no-cache --virtual deps openssl && \ - wget -qO- https://github.com/git-lfs/git-lfs/releases/download/v2.6.1/git-lfs-linux-arm64-v2.6.1.tar.gz | tar xz && \ - mv git-lfs /usr/bin/ && \ - rm -rf git-lfs-* && \ - git lfs install && \ - apk del deps - -# add ssh record on which ssh key to use -COPY ./.ssh/ /root/.ssh/ - -# add fingerprint for major git providers -RUN ssh-keyscan github.com >> /root/.ssh/known_hosts -RUN ssh-keyscan bitbucket.org >> /root/.ssh/known_hosts - -COPY ./start.sh /run/start.sh -RUN chmod +x /run/start.sh - -CMD ["/run/start.sh"]