Skip to content

OCPNETUI-78: Sync Dockerfile and Dockerfile.art #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rszwajko wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −14
Open

OCPNETUI-78: Sync Dockerfile and Dockerfile.art #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
# Builder container
FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.22 AS build
FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-5.0 AS build

# Copy app source
COPY . /opt/app-root/src/app
WORKDIR /opt/app-root/src/app

# Run install as supper tux
# Install dependencies and build
USER 0
RUN npm ci && npm run build
ENV CYPRESS_INSTALL_BINARY=0
RUN npm clean-install --ignore-scripts --no-audit && npm run build

# Web server container
FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9

RUN INSTALL_PKGS="nginx" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum -y clean all --enablerepo='*' && rm -rf /var/cache/dnf/* && \
dnf -y clean all --enablerepo='*' && rm -rf /var/cache/dnf/* && \
chown -R 1001:0 /var/lib/nginx /var/log/nginx /run && \
chmod -R ug+rwX /var/lib/nginx /var/log/nginx /run

# Use none-root user
# Use non-root user
USER 1001

# Set nginx configuration
# COPY nginx.conf /etc/nginx/nginx.conf

# When using ubi9/nginx-120 defaults:
# listen 8080 default_server;
# root /opt/app-root/src;

COPY --from=build /opt/app-root/src/app/dist /opt/app-root/src

# Run the server
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.art
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ COPY . /opt/app-root/src/app
WORKDIR /opt/app-root/src/app

# Install dependencies and build
RUN CYPRESS_INSTALL_BINARY=0 npm ci && npm run build
USER 0
ENV CYPRESS_INSTALL_BINARY=0
RUN npm clean-install --ignore-scripts --no-audit && npm run build

# Web server container
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
Expand Down