UNCLASSIFIED

Commit 864aed25 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !14
parents 8b9f66e6 6f772e4a
Pipeline #140722 failed with stages
in 1 minute and 14 seconds
######################## Base Args ######################## ######################## Base Args ########################
ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.2 ARG BASE_TAG=8.2
ARG UBI_BASE_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ARG UBI_BASE_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -12,7 +12,7 @@ LABEL name="Ruby" \ ...@@ -12,7 +12,7 @@ LABEL name="Ruby" \
vendor="OpenSource" \ vendor="OpenSource" \
summary="Ruby (Red Hat UBI)" \ summary="Ruby (Red Hat UBI)" \
maintainer="OpenSource" \ maintainer="OpenSource" \
version="2.7" version="2.7.2"
USER 0 USER 0
...@@ -26,13 +26,13 @@ RUN dnf install -y --setopt=tsflags=nodocs $PACKAGES \ ...@@ -26,13 +26,13 @@ RUN dnf install -y --setopt=tsflags=nodocs $PACKAGES \
&& /install-gdbm.sh \ && /install-gdbm.sh \
&& /install-ruby.sh \ && /install-ruby.sh \
&& rm -f /install-ruby.sh /install-gdbm.sh \ && rm -f /install-ruby.sh /install-gdbm.sh \
&& rm -rf /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* && rm -rf /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*
FROM ${UBI_BASE_IMAGE} FROM ${UBI_BASE_IMAGE}
RUN dnf update -y \ RUN dnf update -y \
&& dnf clean all \ && dnf clean all \
&& rm -rf /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* && rm -rf /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*
COPY --from=builder /usr/local/bin/ /usr/local/bin/ COPY --from=builder /usr/local/bin/ /usr/local/bin/
COPY --from=builder /usr/local/lib/ /usr/local/lib/ COPY --from=builder /usr/local/lib/ /usr/local/lib/
...@@ -47,7 +47,9 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ ...@@ -47,7 +47,9 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
BUNDLE_APP_CONFIG="$GEM_HOME" BUNDLE_APP_CONFIG="$GEM_HOME"
ENV PATH $HOME/bin:$GEM_HOME/bin:$PATH ENV PATH $HOME/bin:$GEM_HOME/bin:$PATH
RUN mkdir -p "$GEM_HOME" && chmod 700 "$GEM_HOME" RUN mkdir -p "$GEM_HOME" && \
chmod 755 "$GEM_HOME" && \
chown -R 1001:0 "$GEM_HOME"
RUN useradd -u 1001 -g 0 -M -d /opt/app-root/src default && \ RUN useradd -u 1001 -g 0 -M -d /opt/app-root/src default && \
mkdir -p /opt/app-root/src && \ mkdir -p /opt/app-root/src && \
...@@ -55,4 +57,4 @@ RUN useradd -u 1001 -g 0 -M -d /opt/app-root/src default && \ ...@@ -55,4 +57,4 @@ RUN useradd -u 1001 -g 0 -M -d /opt/app-root/src default && \
USER 1001 USER 1001
CMD ["irb"] CMD ["irb"]
\ No newline at end of file
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: "2.7.1") dccscrPipeline(version: "2.7.2")
...@@ -21,4 +21,4 @@ Documentation for this version of Ruby can be found [here](https://docs.ruby-lan ...@@ -21,4 +21,4 @@ Documentation for this version of Ruby can be found [here](https://docs.ruby-lan
This applicaiton is based on the following: This applicaiton is based on the following:
- https://hub.docker.com/_/ruby - https://hub.docker.com/_/ruby
- https://github.com/docker-library/ruby - https://github.com/docker-library/ruby
\ No newline at end of file
--- ---
resources: resources:
- url: https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.gz - url: https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz
filename: ruby-27.tar.gz filename: ruby-27.tar.gz
validation: validation:
type: sha256 type: sha256
value: d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418 value: 6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4
- url: http://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz - url: http://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz
filename: gdbm.tar.gz filename: gdbm.tar.gz
validation: validation:
type: sha256 type: sha256
value: 86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc value: 86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment