Skip to content

[release-1.7] chore: update Dockerfile install dynamic plugin script chmod #3162

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

Merged
nickboldt merged 5 commits into from
Jul 18, 2025
Merged

[release-1.7] chore: update Dockerfile install dynamic plugin script chmod #3162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a578509
chore: update Dockerfile install dynamic plugin script chmod
Zaperex Jul 7, 2025
b54b047
Apply suggestion from @nickboldt
Zaperex Jul 18, 2025
73b11f0
Update .rhdh/docker/Dockerfile
Zaperex Jul 18, 2025
48560c5
chore: update upstream dockerfile
Zaperex Jul 18, 2025
be6cbd8
Apply suggestions from code review
nickboldt Jul 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
3 changes: 1 addition & 2 deletions .rhdh/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,7 @@ COPY $EXTERNAL_SOURCE_NESTED/catalog-entities/marketplace /marketplace/catalog-e

# Copy script to gather dynamic plugins; copy embedded dynamic plugins to root folder; fix permissions
COPY $EXTERNAL_SOURCE_NESTED/docker/install-dynamic-plugins.py $EXTERNAL_SOURCE_NESTED/docker/install-dynamic-plugins.sh ./
RUN ./install-dynamic-plugins.py; \
chmod -R a+rx ./install-dynamic-plugins.sh
RUN chmod -R a+rx ./install-dynamic-plugins.*

# The existence of the index.html.tmpl tells Backstage to take that file and load it into memory, inject the needed appConfig (instead of writing
# it into a random *.chunk.js file, and then serve that file from memory so that we can set the readOnlyRootFilesystem: true option for
Expand Down
3 changes: 1 addition & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
systemd-pam systemd-rpm-macros tar tcl tpm2-tss tzdata unzip usermode util-linux util-linux-core vim-filesystem vim-minimal virt-what which xz xz-libs yajl yum zlib zlib-devel && \

# '(micro)dnf update -y' not allowed in Konflux+Cachi2: instead use renovate or https://github.com/konflux-ci/rpm-lockfile-prototype to update the rpms.lock.yaml file
dnf clean all

Check warning on line 50 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Image

Empty continuation lines will become errors in a future release 

NoEmptyContinuation: Empty continuation line
More info: https://docs.docker.com/go/dockerfile/rule/no-empty-continuation/

ENV EXTERNAL_SOURCE_NESTED=.
ENV CONTAINER_SOURCE=/opt/app-root/src
Expand Down Expand Up @@ -242,8 +242,7 @@

# Copy script to gather dynamic plugins; copy embedded dynamic plugins to root folder; fix permissions
COPY docker/install-dynamic-plugins.py docker/install-dynamic-plugins.sh ./
RUN chmod -R a+r ./install-dynamic-plugins.py; \
chmod -R a+rx ./install-dynamic-plugins.sh
RUN chmod -R a+rx ./install-dynamic-plugins.*

# The existence of the index.html.tmpl tells Backstage to take that file and load it into memory, inject the needed appConfig (instead of writing
# it into a random *.chunk.js file, and then serve that file from memory so that we can set the readOnlyRootFilesystem: true option for
Expand All @@ -270,7 +269,7 @@

# gGVM6sYRK0D0ndVX22BOtS7NRcxPej8t is key for dev environment
# Upstream - Use dev key in all branches
ENV SEGMENT_WRITE_KEY=gGVM6sYRK0D0ndVX22BOtS7NRcxPej8t

Check warning on line 272 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / Build Image

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "SEGMENT_WRITE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
ENV SEGMENT_TEST_MODE=false

# RHIDP-2217: corporate proxy support (configured using 'global-agent' for 'node-fetch' calls and 'undici' for 'fetch' calls)
Expand Down
Loading