Skip to content

sync with https://github.com/jfclere/tomcat-kubernetes.git #2

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

sync with https://github.com/jfclere/tomcat-kubernetes.git #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd58c40
Synch with https://github.com/jfclere/tomcat-kubernetes
jfclere Nov 16, 2023
b8b5420
Merge branch 'web-servers:main' into main
jfclere Nov 16, 2023
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
11 changes: 5 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
FROM registry.access.redhat.com/ubi8
FROM registry.access.redhat.com/ubi9
LABEL Description="Builder for JWS operator"
VOLUME /tmp

USER root

RUN yum install buildah maven git -y
# for redhat_jws_download.py: python3-requests python3-lxml unzip gcc-c++ pip3 python3-dev -y
# RUN yum install python3-requests python3-lxml unzip gcc-c++ python3-pip python3-devel -y
# RUN pip3 install ujson

#RUN rm -rf /var/lib/containers

# For openshift (a bit hacky)
RUN echo "1000:100000:65536" > /etc/subuid
RUN echo "1000:100000:65536" > /etc/subgid
RUN chmod a+w /etc/subuid
RUN chmod a+w /etc/subgid
#RUN echo "1000:100000:65536" > /etc/subuid
#RUN echo "1000:100000:65536" > /etc/subgid
#RUN chmod a+w /etc/subuid
#RUN chmod a+w /etc/subgid

ADD build.sh /usr/bin/build.sh
# ADD redhat_jws_download.py /usr/bin/redhat_jws_download.py
Expand Down
1 change: 1 addition & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ fi
# ${webAppSourceImage} is what we use in FROM of the Dockerfile
#
echo "Use buildah to build and push to ${webAppWarImage}"
echo "Running STORAGE_DRIVER=vfs buildah bud -f /Dockerfile.JWS -t ${webAppWarImage} --authfile /auth/.dockerconfigjson --build-arg webAppSourceImage=${webAppSourceImage}"
cd /tmp
HOME=/tmp
STORAGE_DRIVER=vfs buildah bud -f /Dockerfile.JWS -t ${webAppWarImage} --authfile /auth/.dockerconfigjson --build-arg webAppSourceImage=${webAppSourceImage}
Expand Down