From b5e6863adf271004637d364fa8819833c4e5613f Mon Sep 17 00:00:00 2001 From: Christopger Vernooy Date: Wed, 21 Oct 2020 14:04:57 -0400 Subject: [PATCH 1/6] inital upload - builds and runs locally --- .gitignore | 1 + Dockerfile | 42 ++++++++++++++++++++++++++++++++++++++++++ Jenkinsfile | 2 ++ README.md | 2 +- download.yaml | 8 ++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100644 download.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b72d989 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +musl-1.2.0.tar.gz diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..67e861d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,42 @@ +ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +ARG BASE_TAG=8.2 +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build +USER 0 +RUN dnf install go wget make cmake gcc -y && \ + dnf upgrade -y && \ + dnf clean all && \ + rm -rf /var/cache/dnf +WORKDIR /opt +COPY musl-1.2.0.tar.gz . +RUN mkdir -p /usr/local/src/musl && \ + tar -zxf /opt/musl-1.2.0.tar.gz -C /usr/local/src/musl --strip-components=1 +WORKDIR /usr/local/src/musl +RUN ./configure && \ + make && \ + make install && \ + rm -f /opt/musl-1.2.0.tar.gz +FROM kubeflow-images-public/katib/suggestion-random:latest as base +#FROM gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416 as base +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +LABEL org.opencontainers.image.title="Katib-suggestion-random" \ + org.opencontainers.image.description="Suggestion Random Service Engine" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.url="gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416" \ + org.opencontainers.image.version="latest" \ + maintainer="cvernooy@oteemo.com" +RUN dnf install go -y && \ + dnf upgrade -y && \ + dnf clean all && \ + rm -rf /var/cache/dnf +USER 0 +COPY --from=build /usr/local/musl/lib/libc.so /usr/local/musl/lib/libc.so +COPY --from=build /lib/ld-musl-x86_64.so.1 /lib/ld-musl-x86_64.so.1 +COPY --from=base /app /app +RUN find / -path /proc -prune -o -perm /4000 -exec chmod u-s {} \; +RUN find / -path /proc -prune -o -perm /2000 -exec chmod g-s {} \; +RUN groupadd -r sugg-random && useradd -r -g sugg-random sugg-random +RUN chown -R sugg-random. /app +WORKDIR /app +USER sugg-random +ENTRYPOINT ["./random"] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..fe3b45d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: "latest") diff --git a/README.md b/README.md index 1dd0df9..8ebcb2a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# suggestion-random-2019 +# metrics-collector-2019 diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..d63f1f5 --- /dev/null +++ b/download.yaml @@ -0,0 +1,8 @@ +resources: + - url: "docker://gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416" + tag: "kubeflow-images-public/katib/suggestion-random:latest" + - url: "https://musl.libc.org/releases/musl-1.2.0.tar.gz" + filename: musl-1.2.0.tar.gz + validation: + type: sha256 + value: c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8 \ No newline at end of file -- GitLab From 0e947620250deaf027886ce12fe71d684946284b Mon Sep 17 00:00:00 2001 From: cvernooy Date: Wed, 21 Oct 2020 18:14:29 +0000 Subject: [PATCH 2/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8ebcb2a..e50c59b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # metrics-collector-2019 +# \ No newline at end of file -- GitLab From 299678ec731c471ba35dc7dfada5b1c29f5fc4b3 Mon Sep 17 00:00:00 2001 From: cvernooy Date: Wed, 21 Oct 2020 18:15:40 +0000 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e50c59b..1c21a2b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # metrics-collector-2019 -# \ No newline at end of file +## \ No newline at end of file -- GitLab From 92fe0013fd2c692f866bd5e6c387d1632020e05e Mon Sep 17 00:00:00 2001 From: cvernooy Date: Tue, 27 Oct 2020 14:03:29 +0000 Subject: [PATCH 4/6] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe3b45d..0143265 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "latest") +dccscrPipeline(version: "898462ec4f1a") -- GitLab From dcef3e1fe6c53c45f2e9a8573e51e58ec725256f Mon Sep 17 00:00:00 2001 From: cvernooy Date: Tue, 27 Oct 2020 19:39:55 +0000 Subject: [PATCH 5/6] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 67e861d..1d389b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,7 @@ LABEL org.opencontainers.image.title="Katib-suggestion-random" \ org.opencontainers.image.version="latest" \ maintainer="cvernooy@oteemo.com" RUN dnf install go -y && \ + dnf remove kernel-headers -y && \ dnf upgrade -y && \ dnf clean all && \ rm -rf /var/cache/dnf @@ -39,4 +40,4 @@ RUN groupadd -r sugg-random && useradd -r -g sugg-random sugg-random RUN chown -R sugg-random. /app WORKDIR /app USER sugg-random -ENTRYPOINT ["./random"] \ No newline at end of file +ENTRYPOINT ["./random"] -- GitLab From d1f2f5f956e188ca86af45f1ff8ffb645882a1ff Mon Sep 17 00:00:00 2001 From: cvernooy Date: Tue, 27 Oct 2020 20:22:12 +0000 Subject: [PATCH 6/6] Update Dockerfile --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d389b0..f8e5c9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,7 @@ LABEL org.opencontainers.image.title="Katib-suggestion-random" \ org.opencontainers.image.url="gcr.io/kubeflow-images-public/katib/suggestion-random@sha256:898462ec4f1ad8a857a3c5d867788b2d042d7cebd8c2c2f040fab0966758b416" \ org.opencontainers.image.version="latest" \ maintainer="cvernooy@oteemo.com" -RUN dnf install go -y && \ - dnf remove kernel-headers -y && \ - dnf upgrade -y && \ +RUN dnf upgrade -y && \ dnf clean all && \ rm -rf /var/cache/dnf USER 0 @@ -38,6 +36,7 @@ RUN find / -path /proc -prune -o -perm /4000 -exec chmod u-s {} \; RUN find / -path /proc -prune -o -perm /2000 -exec chmod g-s {} \; RUN groupadd -r sugg-random && useradd -r -g sugg-random sugg-random RUN chown -R sugg-random. /app +RUN chmod +x /app/random WORKDIR /app USER sugg-random ENTRYPOINT ["./random"] -- GitLab