Skip to content

Commit a6277fd

Browse files
committed
Migrate to .blueprintrc
Earlier attempt overlooked a typo in listen.sh that was deleting the file on container start.
1 parent 82b1753 commit a6277fd

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.helpers/.blueprintrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
OWNERSHIP="nginx:nginx"
2+
WEBUSER="nginx"

.helpers/listen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44
trap 'echo "Interrupted"; exit 1' INT TERM
55

66
# Initial sync
7-
rsync -av --exclude=".blueprint" --include="*.blueprint*" --exclude="*" --delete "/blueprint_extensions/" "/app/"
7+
rsync -av --exclude=".blueprint" --include="*.blueprint" --exclude="*" --delete "/blueprint_extensions/" "/app/"
88

99
# Continuous monitor task
1010
inotifywait -m -q \

Dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,15 @@ RUN wget $(curl -s https://api.github.com/repos/BlueprintFramework/framework/rel
4444
# Required for tput (used in blueprint.sh)
4545
ENV TERM=xterm
4646

47-
# Make blueprint.sh set ownership to nginx:nginx
48-
RUN sed -i -E \
49-
-e "s|OWNERSHIP=\"www-data:www-data\" #;|OWNERSHIP=\"nginx:nginx\" #;|g" \
50-
-e "s|WEBUSER=\"www-data\" #;|WEBUSER=\"nginx\" #;|g" \
51-
blueprint.sh
47+
# Set Blueprint user and permissions
48+
COPY .helpers/.blueprintrc /app/.blueprintrc
5249

5350
# Make the script executable and run it
5451
RUN chmod +x blueprint.sh \
5552
&& bash blueprint.sh
5653

5754
# Create directory for blueprint extensions
58-
RUN mkdir -p /blueprint_extensions /app
55+
RUN mkdir -p /blueprint_extensions
5956

6057
# Copy listen.sh from .helpers directory
6158
COPY .helpers/listen.sh /listen.sh

0 commit comments

Comments
 (0)