Skip to content
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

Update docker files to follow solar lint rules #63

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update docker files to follow solar lint rules #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c98a81f
Fix: WORKDIR instruction should be used instead of cd commands (docke…
docbyte86 Jan 10, 2024
d6907c3
Fix: Cache should be cleaned after package installation (docker:S6587)
docbyte86 Jan 10, 2024
f146f5d
Fix: Cache should be cleaned after package installation (docker:S6587)
docbyte86 Jan 10, 2024
e0dcd91
update indentation
docbyte86 Jan 10, 2024
4ebcc3e
Add apt-get update to update index for package installation
docbyte86 Jan 10, 2024
cb7f6c2
Merge branch 'master' into bugfix/solarlint
docbyte86 Feb 18, 2025
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
6 changes: 4 additions & 2 deletions base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ COPY files/st2.user.conf /etc/st2/
COPY files/st2ctl /etc/default/

# Use custom logging config that'll stream all st2 service logs to stdout and never save to files
RUN cd /etc/st2; \
WORKDIR /etc/st2; \
for file in /etc/st2/logging.*.conf; do \
rm -f ${file}; \
ln -s logging.docker.conf ${file}; \
Expand All @@ -71,7 +71,9 @@ RUN apt-get install -y crudini \
&& crudini --merge /etc/st2/st2.conf < /tmp/st2.tmp.conf \
&& rm -f /tmp/st2.tmp.conf \
&& apt-get purge -y crudini \
&& apt-get autoremove -y
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* \
&& apt-get clean

# Add Custom "StackStorm" welcome message
COPY files/.welcome.sh /etc/skel/.welcome
Expand Down
13 changes: 8 additions & 5 deletions st2actionrunner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ FROM --platform=linux/amd64 stackstorm/st2:${ST2_VERSION}
LABEL com.stackstorm.component="st2actionrunner"

# Install utils used by st2 'linux' pack, part of StackStorm core
RUN apt-get install -y rsync \
inetutils-traceroute \
net-tools \
dnsutils \
sendmail
RUN apt-get -qq update \
&& apt-get install -y rsync \
inetutils-traceroute \
net-tools \
dnsutils \
sendmail \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* \
&& apt-get clean

USER root

Expand Down
8 changes: 6 additions & 2 deletions st2web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ABF5BD827B
&& echo "deb http://nginx.org/packages/ubuntu/ focal nginx" > /etc/apt/sources.list.d/nginx.list \
&& apt-get update \
&& apt-get install -y nginx \
&& rm -f /etc/apt/sources.list.d/nginx.list
&& rm -f /etc/apt/sources.list.d/nginx.list \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* \
&& apt-get clean

# Install StackStorm Web UI
RUN if [ "${ST2_VERSION#*dev}" != "${ST2_VERSION}" ]; then \
Expand Down Expand Up @@ -71,7 +73,9 @@ RUN if [ "${ST2_VERSION#*dev}" != "${ST2_VERSION}" ]; then \
&& rm -f /etc/nginx/conf.d/default.conf \
&& rm -f /tmp/st2.conf.patch \
&& rm -f /tmp/st2.conf-http.patch \
&& rm -f /tmp/st2.conf-https.patch
&& rm -f /tmp/st2.conf-https.patch \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* \
&& apt-get clean

# It's a user's responsbility to pass the valid SSL certificate files: 'st2.key' and 'st2.crt', used in nginx
VOLUME ["/etc/ssl/st2/"]
Expand Down