Compare commits

..

No commits in common. "1f9c311b6c70963d09720ca93f8da2d78751158c" and "e66a4f0834fbb2a7fa5372ceda3f83bde83f737b" have entirely different histories.

3 changed files with 3 additions and 20 deletions

View File

@ -4,6 +4,7 @@ RUN useradd -ms /bin/bash --uid 1000 jekyll
RUN mkdir -p -m 0755 /app/jekyll RUN mkdir -p -m 0755 /app/jekyll
RUN mkdir -p -m 0755 /opt/jekyll RUN mkdir -p -m 0755 /opt/jekyll
COPY ./entrypoint.sh /opt/jekyll COPY ./entrypoint.sh /opt/jekyll
VOLUME $PWD/data:/opt/jekyll
RUN chmod +x /opt/jekyll/ && \ RUN chmod +x /opt/jekyll/ && \
chown -R 1000:1000 /opt/jekyll && \ chown -R 1000:1000 /opt/jekyll && \
chown -R 1000:1000 /app chown -R 1000:1000 /app

View File

@ -12,7 +12,4 @@ services:
- ${WWW_PORT:-4000}:4000 - ${WWW_PORT:-4000}:4000
volumes: volumes:
- ./jekyll:/app/jekyll - ./jekyll:/app/jekyll
- jekyll_bundle:/usr/local/bundle - ./data:/opt/jekyll
volumes:
jekyll_bundle:

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
source /opt/jekyll/.env
export AUTHOR_EMAIL=$AUTHOR_EMAIL export AUTHOR_EMAIL=$AUTHOR_EMAIL
export BLOG_NAME=$BLOG_NAME export BLOG_NAME=$BLOG_NAME
export BASE_URL=$BASE_URL export BASE_URL=$BASE_URL
@ -15,22 +16,6 @@ export TWITTER_USERNAME=$TWITTER_USERNAME
export WWW_PORT=$WWW_PORT export WWW_PORT=$WWW_PORT
export URL=$URL export URL=$URL
printf "🖙 Set values:
🖙 Author email: $AUTHOR_EMAIL
🖙 Blog name: $BLOG_NAME
🖙 Base URL: $BASE_URL
🖙 Github username: $GITHUB_USERNAME
🖙 Host URL: $HOST_URL
🖙 Jekyll environment: $JEKYLL_ENV
🖙 Live-reload port: $LIVERELOAD_PORT
🖙 Local site files path: $SITE_PATH
🖙 Site title: $SITE_TITLE
🖙 Current theme: $THEME
🖙 Xwitter username: $TWITTER_USERNAME
🖙 WWW port: $WWW_PORT
🖙 URL: $URL
"
update_config() { update_config() {
for ENV_VAR in 'AUTHOR_EMAIL' 'BASE_URL' 'GITHUB_USERNAME' \ for ENV_VAR in 'AUTHOR_EMAIL' 'BASE_URL' 'GITHUB_USERNAME' \
'SITE_TITLE' 'THEME' 'TWITTER_USERNAME' 'URL'; do 'SITE_TITLE' 'THEME' 'TWITTER_USERNAME' 'URL'; do