Skip to content

Commit

Permalink
fix: removing duplicate code and using absolute path on change chmod …
Browse files Browse the repository at this point in the history 
…of init-wrapper
  • Loading branch information
Costas Papastathis committed May 27, 2024
1 parent b7223ce commit 7c5525b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion 14/Dockerfile.fedora
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN yum -y module enable nodejs:$NODEJS_VERSION && \

# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
RUN chmod +x /usr/libexec/s2i/init-wrapper

# Copy extra files to the image, including help file.
COPY ./root/ /
Expand Down
4 changes: 1 addition & 3 deletions 18-minimal/Dockerfile.c8s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which

COPY ./s2i/bin/ /usr/libexec/s2i

# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
RUN chmod +x /usr/libexec/s2i/init-wrapper

# Copy extra files to the image.
COPY ./root/ /
Expand Down
5 changes: 1 addition & 4 deletions 18-minimal/Dockerfile.c9s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

COPY ./s2i/bin/ /usr/libexec/s2i

# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
RUN chmod +x /usr/libexec/s2i/init-wrapper

# Copy extra files to the image.
COPY ./root/ /
Expand Down
2 changes: 1 addition & 1 deletion 18-minimal/Dockerfile.fedora
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n nodejs-npm findutils ta
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

COPY ./s2i/bin/ /usr/libexec/s2i
RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
RUN chmod +x /usr/libexec/s2i/init-wrapper

# Copy extra files to the image.
COPY ./root/ /
Expand Down
4 changes: 1 addition & 3 deletions 18-minimal/Dockerfile.rhel8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which

COPY ./s2i/bin/ /usr/libexec/s2i

# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
RUN chmod +x /usr/libexec/s2i/init-wrapper

# Copy extra files to the image.
COPY ./root/ /
Expand Down
4 changes: 1 addition & 3 deletions 18-minimal/Dockerfile.rhel9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which

COPY ./s2i/bin/ /usr/libexec/s2i

# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
COPY ./s2i/bin/ $STI_SCRIPTS_PATH
RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
RUN chmod +x /usr/libexec/s2i/init-wrapper

# Copy extra files to the image.
COPY ./root/ /
Expand Down

0 comments on commit 7c5525b

Please sign in to comment.