Update docker-library images #3675
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- `drupal`: 8.4.2 - `ghost`: fix `sqlite3` for non-amd64 arches (docker-library/ghost#101)
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index a9afb75..c6aad13 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -22,10 +22,10 @@ drupal:8.4
drupal:8.4-apache
drupal:8.4-fpm
drupal:8.4-fpm-alpine
-drupal:8.4.1
-drupal:8.4.1-apache
-drupal:8.4.1-fpm
-drupal:8.4.1-fpm-alpine
+drupal:8.4.2
+drupal:8.4.2-apache
+drupal:8.4.2-fpm
+drupal:8.4.2-fpm-alpine
drupal:apache
drupal:fpm
drupal:fpm-alpine
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_fpm-alpine/Dockerfile
index bfc3760..db45904 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_fpm-alpine/Dockerfile
@@ -38,8 +38,8 @@ RUN { \
WORKDIR /var/www/html
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.4.1
-ENV DRUPAL_MD5 1c1db36ac5217f315bf9c03d64529f10
+ENV DRUPAL_VERSION 8.4.2
+ENV DRUPAL_MD5 a2b294d82ce751f93ba600f2de7884f4
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index 37f62e4..802bd1e 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -34,8 +34,8 @@ RUN { \
WORKDIR /var/www/html
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.4.1
-ENV DRUPAL_MD5 1c1db36ac5217f315bf9c03d64529f10
+ENV DRUPAL_VERSION 8.4.2
+ENV DRUPAL_MD5 a2b294d82ce751f93ba600f2de7884f4
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index 58be351..aaa5329 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -36,8 +36,8 @@ RUN { \
WORKDIR /var/www/html
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.4.1
-ENV DRUPAL_MD5 1c1db36ac5217f315bf9c03d64529f10
+ENV DRUPAL_VERSION 8.4.2
+ENV DRUPAL_MD5 a2b294d82ce751f93ba600f2de7884f4
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/ghost_alpine/Dockerfile b/ghost_alpine/Dockerfile
index 332f073..3617c1f 100644
--- a/ghost_alpine/Dockerfile
+++ b/ghost_alpine/Dockerfile
@@ -9,16 +9,16 @@ RUN apk add --no-cache \
# add "bash" for "[["
bash
-ENV NPM_CONFIG_LOGLEVEL warn
ENV NODE_ENV production
-ENV GHOST_CLI_VERSION 1.2.0
-ENV GHOST_VERSION 1.16.2
-RUN npm install -g "ghost-cli@$GHOST_CLI_VERSION" knex-migrator@latest
+ENV GHOST_CLI_VERSION 1.2.0
+RUN npm install -g "ghost-cli@$GHOST_CLI_VERSION"
ENV GHOST_INSTALL /var/lib/ghost
ENV GHOST_CONTENT /var/lib/ghost/content
+ENV GHOST_VERSION 1.16.2
+
RUN set -ex; \
mkdir -p "$GHOST_INSTALL"; \
chown node:node "$GHOST_INSTALL"; \
@@ -37,7 +37,16 @@ RUN set -ex; \
# need to save initial content for pre-seeding empty volumes
mv "$GHOST_CONTENT" "$GHOST_INSTALL/content.orig"; \
mkdir -p "$GHOST_CONTENT"; \
- chown node:node "$GHOST_CONTENT"
+ chown node:node "$GHOST_CONTENT"; \
+ \
+# symlink knex-migrator bins into PATH
+# we want these from the context of Ghost's "node_modules" directory (instead of doing "npm install -g knex-migrator") so they can share the DB driver modules
+ for f in "$GHOST_INSTALL/current/node_modules/.bin/knex-migrator"*; do \
+ [ -x "$f" ]; \
+ ln -svf "$f" /usr/local/bin/; \
+ done
+
+# TODO multiarch sqlite3 (once either "node:6-alpine" has multiarch or we switch to a base that does)
WORKDIR $GHOST_INSTALL
VOLUME $GHOST_CONTENT
diff --git a/ghost_latest/Dockerfile b/ghost_latest/Dockerfile
index 5e61625..a399369 100644
--- a/ghost_latest/Dockerfile
+++ b/ghost_latest/Dockerfile
@@ -14,16 +14,16 @@ RUN set -x \
&& chmod +x /usr/local/bin/gosu \
&& gosu nobody true
-ENV NPM_CONFIG_LOGLEVEL warn
ENV NODE_ENV production
-ENV GHOST_CLI_VERSION 1.2.0
-ENV GHOST_VERSION 1.16.2
-RUN npm install -g "ghost-cli@$GHOST_CLI_VERSION" knex-migrator@latest
+ENV GHOST_CLI_VERSION 1.2.0
+RUN npm install -g "ghost-cli@$GHOST_CLI_VERSION"
ENV GHOST_INSTALL /var/lib/ghost
ENV GHOST_CONTENT /var/lib/ghost/content
+ENV GHOST_VERSION 1.16.2
+
RUN set -ex; \
mkdir -p "$GHOST_INSTALL"; \
chown node:node "$GHOST_INSTALL"; \
@@ -42,7 +42,35 @@ RUN set -ex; \
# need to save initial content for pre-seeding empty volumes
mv "$GHOST_CONTENT" "$GHOST_INSTALL/content.orig"; \
mkdir -p "$GHOST_CONTENT"; \
- chown node:node "$GHOST_CONTENT"
+ chown node:node "$GHOST_CONTENT"; \
+ \
+# symlink knex-migrator bins into PATH
+# we want these from the context of Ghost's "node_modules" directory (instead of doing "npm install -g knex-migrator") so they can share the DB driver modules
+ for f in "$GHOST_INSTALL/current/node_modules/.bin/knex-migrator"*; do \
+ [ -x "$f" ]; \
+ ln -svf "$f" /usr/local/bin/; \
+ done
+
+RUN set -eux; \
+# force install "sqlite3" manually since it's an optional dependency of "ghost"
+# (which means that if it fails to install, like on ARM/ppc64le/s390x, the failure will be silently ignored and thus turn into a runtime error instead)
+# see https://github.com/TryGhost/Ghost/pull/7677 for more details
+ cd "$GHOST_INSTALL/current"; \
+# scrape the expected version of sqlite3 directly from Ghost itself
+ sqlite3Version="$(npm view . optionalDependencies.sqlite3)"; \
+ if ! gosu node npm install "sqlite3@$sqlite3Version"; then \
+# must be some non-amd64 architecture pre-built binaries aren't published for, so let's install some build deps and do-it-all-over-again
+ savedAptMark="$(apt-mark showmanual)"; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends python make gcc g++ libc-dev; \
+ rm -rf /var/lib/apt/lists/*; \
+ \
+ gosu node npm install "sqlite3@$sqlite3Version" --build-from-source; \
+ \
+ apt-mark showmanual | xargs apt-mark auto > /dev/null; \
+ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
+ apt-get purge -y --auto-remove; \
+ fi
WORKDIR $GHOST_INSTALL
VOLUME $GHOST_CONTENT |
|
Build test of #3675; 4495d97; $ bashbrew build drupal:8.4.2-apache
Building bashbrew/cache:9505cbf170e11a81293607077871c109de087ad4d50024877d05688a3ba0089d (drupal:8.4.2-apache)
Tagging drupal:8.4.2-apache
Tagging drupal:8.4-apache
Tagging drupal:8-apache
Tagging drupal:apache
Tagging drupal:8.4.2
Tagging drupal:8.4
Tagging drupal:8
Tagging drupal:latest
$ test/run.sh drupal:8.4.2-apache
testing drupal:8.4.2-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.4.2-fpm
Building bashbrew/cache:b5d97bb548c25a099069350cbdd34da5ba2a95ebabfbe11311b38ec663bd5418 (drupal:8.4.2-fpm)
Tagging drupal:8.4.2-fpm
Tagging drupal:8.4-fpm
Tagging drupal:8-fpm
Tagging drupal:fpm
$ test/run.sh drupal:8.4.2-fpm
testing drupal:8.4.2-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.4.2-fpm-alpine
Building bashbrew/cache:648558259a5064bbbce14426cfd7ce6229b24740e55b0fbacdf4f72d47bf6a99 (drupal:8.4.2-fpm-alpine)
Tagging drupal:8.4.2-fpm-alpine
Tagging drupal:8.4-fpm-alpine
Tagging drupal:8-fpm-alpine
Tagging drupal:fpm-alpine
$ test/run.sh drupal:8.4.2-fpm-alpine
testing drupal:8.4.2-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.3.7-apache
Using bashbrew/cache:f79ebf4673c90560415c92ad71b5177f7dcf9388c16c9532da2d06e5d30088b4 (drupal:8.3.7-apache)
Tagging drupal:8.3.7-apache
Tagging drupal:8.3-apache
Tagging drupal:8.3.7
Tagging drupal:8.3
$ test/run.sh drupal:8.3.7-apache
testing drupal:8.3.7-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.3.7-fpm
Using bashbrew/cache:b905874481c15e6ecca0f93c072ba00cc04a29686d006b6a601faa4d51254e3a (drupal:8.3.7-fpm)
Tagging drupal:8.3.7-fpm
Tagging drupal:8.3-fpm
$ test/run.sh drupal:8.3.7-fpm
testing drupal:8.3.7-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.3.7-fpm-alpine
Using bashbrew/cache:22f229cea567846b6935d2f30c750e73e2ec5c8657526afaad3cca9ab0f358bb (drupal:8.3.7-fpm-alpine)
Tagging drupal:8.3.7-fpm-alpine
Tagging drupal:8.3-fpm-alpine
$ test/run.sh drupal:8.3.7-fpm-alpine
testing drupal:8.3.7-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:7.56-apache
Using bashbrew/cache:08f5066f0de4027a89a364b9249e298a3439e9f9ba616843e55d04ca448338c8 (drupal:7.56-apache)
Tagging drupal:7.56-apache
Tagging drupal:7-apache
Tagging drupal:7.56
Tagging drupal:7
$ test/run.sh drupal:7.56-apache
testing drupal:7.56-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:7.56-fpm
Using bashbrew/cache:916b769a7784a57b401f54afa06b46e120cb52cd9e1c3d7984d202e2bd1ffdd3 (drupal:7.56-fpm)
Tagging drupal:7.56-fpm
Tagging drupal:7-fpm
$ test/run.sh drupal:7.56-fpm
testing drupal:7.56-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:7.56-fpm-alpine
Using bashbrew/cache:2c38ff8c0758524eebfc70e238338d4d790609acba58bde52311997e6fd6511d (drupal:7.56-fpm-alpine)
Tagging drupal:7.56-fpm-alpine
Tagging drupal:7-fpm-alpine
$ test/run.sh drupal:7.56-fpm-alpine
testing drupal:7.56-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ghost:1.16.2
Building bashbrew/cache:bd58b1a4a5251ba1b8838ac21297052a3f25a5247623cfced017703709d5dd57 (ghost:1.16.2)
Tagging ghost:1.16.2
Tagging ghost:1.16
Tagging ghost:1
Tagging ghost:latest
$ test/run.sh ghost:1.16.2
testing ghost:1.16.2
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'ghost-basics' [5/5].....passed
$ bashbrew build ghost:1.16.2-alpine
Building bashbrew/cache:dc4e750c04d211e28e71c5021013a34ebccffc33011114c514b43006358f5dd3 (ghost:1.16.2-alpine)
Tagging ghost:1.16.2-alpine
Tagging ghost:1.16-alpine
Tagging ghost:1-alpine
Tagging ghost:alpine
$ test/run.sh ghost:1.16.2-alpine
testing ghost:1.16.2-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'ghost-basics' [5/5].....passed
$ bashbrew build ghost:0.11.12
Using bashbrew/cache:5bf2f659c8686f8ffa71928651f664a5145c2333c3a1a635dd6f3f9158b95e66 (ghost:0.11.12)
Tagging ghost:0.11.12
Tagging ghost:0.11
Tagging ghost:0
$ test/run.sh ghost:0.11.12
testing ghost:0.11.12
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'ghost-basics' [5/5]....passed
$ bashbrew build ghost:0.11.12-alpine
Using bashbrew/cache:de7f978f09a237e366002f21ba1f041a12bc08a39f00b7c2dd51f7bde8295b85 (ghost:0.11.12-alpine)
Tagging ghost:0.11.12-alpine
Tagging ghost:0.11-alpine
Tagging ghost:0-alpine
$ test/run.sh ghost:0.11.12-alpine
testing ghost:0.11.12-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'ghost-basics' [5/5]....passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
drupal: 8.4.2ghost: fixsqlite3for non-amd64 arches (Fix sqlite3 for non-amd64 arches ghost#101)