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

Jump to bottom

This pull request fixes issue 42 #141

Merged
merged 2 commits into from
Jun 5, 2024
Merged

This pull request fixes issue 42 #141

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
cd534f5
Fixes: #42 Moving sources instead of copying sources like it is done
phracek Apr 17, 2024
ee6a990
Add distgen generated files
phracek Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions 6/s2i/bin/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

set -e

echo "---> Copying varnish configuration files..."
shopt -s dotglob
echo "---> Installing application source..."
rm -rf "${VARNISH_CONFIGURATION_PATH}/default.vcl"
cp -Rfv /tmp/src/. "${VARNISH_CONFIGURATION_PATH}"
rm -fR /tmp/src/.git
mv /tmp/src/* "${VARNISH_CONFIGURATION_PATH}"

# Fix source directory permissions
fix-permissions ./
Expand Down
6 changes: 4 additions & 2 deletions 7/s2i/bin/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

set -e

echo "---> Copying varnish configuration files..."
shopt -s dotglob
echo "---> Installing application source..."
rm -rf "${VARNISH_CONFIGURATION_PATH}/default.vcl"
cp -Rfv /tmp/src/. "${VARNISH_CONFIGURATION_PATH}"
rm -fR /tmp/src/.git
mv /tmp/src/* "${VARNISH_CONFIGURATION_PATH}"

# Fix source directory permissions
fix-permissions ./
Expand Down
6 changes: 4 additions & 2 deletions src/s2i/bin/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

set -e

echo "---> Copying varnish configuration files..."
shopt -s dotglob
zmiklank marked this conversation as resolved.
Show resolved Hide resolved
echo "---> Installing application source..."
rm -rf "${VARNISH_CONFIGURATION_PATH}/default.vcl"
cp -Rfv /tmp/src/. "${VARNISH_CONFIGURATION_PATH}"
rm -fR /tmp/src/.git
mv /tmp/src/* "${VARNISH_CONFIGURATION_PATH}"

# Fix source directory permissions
fix-permissions ./
Expand Down