From 680008410d80c0c2e92b9d77d392af020ae0b2c4 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Wed, 16 Oct 2024 08:02:47 -0700 Subject: [PATCH 1/2] :sparkles: Support run as AnyUser. Signed-off-by: Jeff Ortel --- Dockerfile | 2 -- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddc48ab..9e40ad1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ COPY --chown=1001:0 . . RUN make cmd FROM registry.access.redhat.com/ubi9/ubi-minimal:latest -USER root RUN echo -e "[centos9]" \ "\nname = centos9" \ "\nbaseurl = http://mirror.stream.centos.org/9-stream/AppStream/\$basearch/os/" \ @@ -15,7 +14,6 @@ RUN microdnf -y install \ subversion \ git \ tar -USER default ENV HOME=/addon ADDON=/addon WORKDIR /addon ARG GOPATH=/opt/app-root diff --git a/go.mod b/go.mod index 16ae9ce..2536795 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/devfile/alizer v1.6.0 - github.com/konveyor/tackle2-addon v0.4.0 - github.com/konveyor/tackle2-hub v0.4.1-0.20240617174440-68b5626680e3 + github.com/konveyor/tackle2-addon v0.6.0-alpha.1.0.20241010185506-67652f48f2f2 + github.com/konveyor/tackle2-hub v0.5.0-rc.1.0.20240726125502-8bb3c0911660 ) require ( diff --git a/go.sum b/go.sum index 3c40ad3..62668c3 100644 --- a/go.sum +++ b/go.sum @@ -131,10 +131,10 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/konveyor/tackle2-addon v0.4.0 h1:LCuQwx9Va6o8dFL0qLPK2PTplaIF0944SXzFQbXOdYs= -github.com/konveyor/tackle2-addon v0.4.0/go.mod h1:d5jsa9qR1PKF8J7ZZcxfg9K+KFScu5YJQrp1Yzhjoss= -github.com/konveyor/tackle2-hub v0.4.1-0.20240617174440-68b5626680e3 h1:5LfPzT3N95Iqyz2VlIY7GTuD6iS8yeoqVHeeg9y4NZA= -github.com/konveyor/tackle2-hub v0.4.1-0.20240617174440-68b5626680e3/go.mod h1:5c5A3i/oARdUp1yo+iYJFFvsIlsbsVGBZT7/CQji9YY= +github.com/konveyor/tackle2-addon v0.6.0-alpha.1.0.20241010185506-67652f48f2f2 h1:xmH1Uw9mGajwXOSsyP3D9j+mHO+7/ukZOyqKKTqjFg0= +github.com/konveyor/tackle2-addon v0.6.0-alpha.1.0.20241010185506-67652f48f2f2/go.mod h1:1cHTnmMGtYzv0GIMiyEMPkJe+hOlzbhxwRal5e7Mog0= +github.com/konveyor/tackle2-hub v0.5.0-rc.1.0.20240726125502-8bb3c0911660 h1:joaeY9ndWjNd6rgwyhoa+lgcIRiNwvAcR9LWQvAyN10= +github.com/konveyor/tackle2-hub v0.5.0-rc.1.0.20240726125502-8bb3c0911660/go.mod h1:5c5A3i/oARdUp1yo+iYJFFvsIlsbsVGBZT7/CQji9YY= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= From 50444c476a0a138095a2de193f1f55d0373f2f78 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Wed, 16 Oct 2024 08:04:37 -0700 Subject: [PATCH 2/2] Add SSH known-hosts. Signed-off-by: Jeff Ortel --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9e40ad1..ce70209 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,8 @@ RUN microdnf -y install \ subversion \ git \ tar +RUN echo -e "StrictHostKeyChecking no" \ + "\nUserKnownHostsFile /dev/null" > /etc/ssh/ssh_config.d/99-konveyor.conf ENV HOME=/addon ADDON=/addon WORKDIR /addon ARG GOPATH=/opt/app-root