UNCLASSIFIED

Commit 5a84f230 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'private/peaxy-hpac-em' into 'development'

Private/peaxy hpac em

See merge request !5
parents 041e6b8f 3c441f98
Pipeline #330703 passed with stages
in 11 minutes and 58 seconds
......@@ -4,7 +4,7 @@ ARG BASE_TAG=8.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ARG VERSION=1.0.0.1
ARG VERSION=1.0.0.2
ARG USERNAME=alpha
ARG GROUPNAME=alpha
......@@ -24,14 +24,14 @@ COPY --chown=1000:1000 \
LICENSE \
README.md \
hpac.tar.gz \
hpac_dependencies.tar.gz \
hpac_dependencies_v2.tar.gz \
./
RUN yum install -y python3.8 && \
yum clean all && \
rm -rf /var/cache/dnf && \
mv /hpac.tar.gz /app/hpac.tar.gz && \
mv hpac_dependencies.tar.gz /app/ && \
mv hpac_dependencies_v2.tar.gz /app/ && \
mv LICENSE /app/ && \
mv README.md /app/ && \
tar -zxf /app/hpac.tar.gz --directory /app/ && \
......@@ -41,10 +41,10 @@ RUN yum install -y python3.8 && \
USER $UID:$GID
RUN tar -zxf ./app/hpac_dependencies.tar.gz --directory ./app/dependencies && \
RUN tar -zxf ./app/hpac_dependencies_v2.tar.gz --directory ./app/dependencies && \
python3 -m pip install --user --no-warn-script-location --no-index --find-links ./app/dependencies -r ./app/dependencies/requirements.txt && \
rm -rf /dependencies && \
rm /app/hpac_dependencies.tar.gz
rm /app/hpac_dependencies_v2.tar.gz
WORKDIR /app
......
......@@ -8,7 +8,7 @@ name: "peaxy/hpac-em"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "1.0.0.1"
- "1.0.0.2"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://peaxy.net/"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Peaxy, Inc"
org.opencontainers.image.version: "1.0.0.1"
org.opencontainers.image.version: "1.0.0.2"
## Keywords to help with search (ex. "cicd,gitops,golang")
# mil.dso.ironbank.image.keywords: "user management"
## This value can be "opensource" or "commercial"
......@@ -45,11 +45,11 @@ resources:
auth:
id: peaxy-credential
region: us-east-1
- filename: hpac_dependencies.tar.gz
url: s3://peaxy-core/hpac-em/hpac_dependencies.tar.gz
- filename: hpac_dependencies_v2.tar.gz
url: s3://peaxy-core/hpac-em/hpac_dependencies_v2.tar.gz
validation:
type: sha256
value: 173f06599f0cd6f2f33bb72e5455a5f19ec7f3494fe54aeec4870e43fec79096
value: e7cf6cd07822a9666446784bd7ab3ff7d158dc3b9293f4c749a50f5c48450986
auth:
id: peaxy-credential
region: us-east-1
......
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