Skip to content

Commit

Permalink
Update to Ghost 1.19.0
Browse files Browse the repository at this point in the history
donovanmuller committed Dec 19, 2017
1 parent 3fd9d3a commit 1454790
Showing 13 changed files with 73 additions and 6,107 deletions.
9 changes: 6 additions & 3 deletions app/assets/css/amp.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/author.hbs
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
<section class="author-section">
{{#author}}
<div class="author-profile">
{{#if feature_image}}
<img src="{{img_url feature_image}}" alt="{{name}}"/>
{{#if profile_image}}
<img src="{{img_url profile_image}}" alt="{{name}}"/>
{{else}}
<img src="//www.gravatar.com/avatar?d=mm&s=512" alt="{{name}}"/>
{{/if}}
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "brage",
"version": "2.0.0",
"version": "2.1.0",
"description": "Brage Ghost theme",
"repository": "https://github.com/switchbitio/brage-ghost-theme",
"license": "MIT",
"engines": {
"ghost": ">=1.0.0"
"ghost": ">=1.19.0"
},
"config": {
"posts_per_page": 5
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -4,6 +4,6 @@
"description": "Brage Ghost theme",
"dependencies": {
"normalize-scss": "~3.0.3",
"highlightjs": "~9.4.0"
"highlightjs": "~9.12.0"
}
}
6 changes: 3 additions & 3 deletions docker-cloud.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ghost-content:
image: donovanmuller/ghost-content:0.11.9
image: donovanmuller/ghost-content:1.19.0
command: echo "Ghost content volume"
autoredeploy: false

ghost:
image: donovanmuller/ghost-with-brage-theme:0.11.9
image: donovanmuller/ghost-with-brage-theme:1.19.0
volumes_from:
- ghost-content
environment:
- VIRTUAL_HOST=?
- LETSENCRYPT_HOST=?
- LETSENCRYPT_EMAIL=?
- BLOG_URL=?
- url=?
restart: always
2 changes: 1 addition & 1 deletion docker/content/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ghost:0.11.9
FROM ghost:1.19.0-alpine

VOLUME $GHOST_CONTENT
2 changes: 1 addition & 1 deletion docker/docker-compose.https.yml
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ services:
- VIRTUAL_PORT=2368
- LETSENCRYPT_HOST=?
- LETSENCRYPT_EMAIL=?
- BLOG_URL=http://brage.switchbit.local.io
- url=http://brage.switchbit.local.io
networks:
- proxy-tier

2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ ghost:
volumes_from:
- content
environment:
- BLOG_URL=http://brage.switchbit.local.io
- url=http://brage.switchbit.local.io

content:
build: content
24 changes: 16 additions & 8 deletions docker/ghost/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
FROM ghost:0.11.9
FROM ghost:1.19.0-alpine

WORKDIR $GHOST_SOURCE
ADD dist/ content/themes/brage
RUN sed -i.bak s/casper/brage/g "/usr/src/ghost/core/server/data/schema/default-settings.json"
WORKDIR $GHOST_INSTALL

ADD config-prod.js config.example.js
ADD dist/ current/content/themes/brage
RUN apk update && \
apk --no-cache add jq
RUN jq '.theme.active_theme.defaultValue="brage" \
| .blog.logo.defaultValue=null \
| .blog.cover_image.defaultValue=null' \
current/core/server/data/schema/default-settings.json \
> /tmp/default-settings.json && \
mv /tmp/default-settings.json current/core/server/data/schema/default-settings.json

ADD config.production.json config.production.json

ENV NODE_ENV production
ENV BLOG_URL ?
ENV MAILGUN_USER ?
ENV MAILGUN_PASSWORD ?
ENV url ?
ENV mail__options__auth__user ?
ENV mail__options__auth__pass ?

EXPOSE 2368
38 changes: 0 additions & 38 deletions docker/ghost/config-prod.js

This file was deleted.

23 changes: 23 additions & 0 deletions docker/ghost/config.production.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"url": "url",
"server": {
"host": "0.0.0.0",
"port": 2368
},
"database": {
"client": "sqlite3",
"connection": {
"filename": "content/data/ghost.db"
},
"debug": false
},
"paths": {
"contentPath": "content/"
},
"mail": {
"transport": "SMTP",
"options": {
"service": "Mailgun"
}
}
}
6,030 changes: 0 additions & 6,030 deletions package-lock.json

This file was deleted.

34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "brage-ghost-theme",
"version": "2.0.0",
"version": "2.1.0",
"description": "Brage Ghost theme",
"license": "MIT",
"repository": "switchbitio/brage-ghost-theme",
@@ -11,38 +11,38 @@
"devDependencies": {
"bower": "^1.7.9",
"browser-sync": "^2.18.13",
"del": "^2.2.2",
"ghost": "^1.0.2",
"del": "^3.0.0",
"ghost": "^1.19.0",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.1",
"gulp-autoprefixer": "^4.0.0",
"gulp-cdnizer": "^1.1.7",
"gulp-cssnano": "^2.1.2",
"gulp-env": "^0.4.0",
"gulp-google-webfonts": "0.0.14",
"gulp-gzip": "^1.3.0",
"gulp-htmlmin": "^2.0.0",
"gulp-imagemin": "^3.3.0",
"gulp-htmlmin": "^3.0.0",
"gulp-imagemin": "^4.0.0",
"gulp-inline-source": "^3.1.0",
"gulp-install": "^0.6.0",
"gulp-install": "^1.1.0",
"gulp-jshint": "^2.0.4",
"gulp-msg": "0.0.1",
"gulp-msg": "0.0.4",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.5.4",
"gulp-rev": "^7.1.2",
"gulp-replace": "^0.6.1",
"gulp-rev": "^8.1.0",
"gulp-rev-collector": "^1.0.5",
"gulp-sass": "^2.3.2",
"gulp-shell": "^0.5.2",
"gulp-sass": "^3.1.0",
"gulp-shell": "^0.6.3",
"gulp-size": "^2.1.0",
"gulp-sourcemaps": "^1.6.0",
"gulp-sym": "0.0.14",
"gulp-uglify": "^2.0.1",
"gulp-sourcemaps": "^2.6.1",
"gulp-sym": "1.0.2",
"gulp-uglify": "^3.0.0",
"gulp-useref": "^3.1.2",
"gulp-webp": "^2.3.0",
"gulp-zip": "^3.2.0",
"gulp-zip": "^4.0.0",
"jshint": "^2.9.5",
"jshint-stylish": "^2.2.1",
"require-dir": "^0.3.2",
"run-sequence": "^1.2.2",
"run-sequence": "^2.2.0",
"wiredep": "^4.0.0"
},
"dependencies": {

0 comments on commit 1454790

Please sign in to comment.