Skip to content

Commit

Permalink
try using VOLUME instruction
Browse files Browse the repository at this point in the history
  • Loading branch information
amneale committed Nov 21, 2015
1 parent f2fe941 commit e3efd66
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 52 deletions.
15 changes: 3 additions & 12 deletions Dockerfile 100644 → 100755
@@ -1,15 +1,7 @@
FROM ubuntu:latest
MAINTAINER Romans <me@nearly.guru>
MAINTAINER Adam <adam@adam-neale.co.uk>

# This dockerfile is suitable for installing Wordpress
# installation. The script will also look for /data volume
# in anticipation of an existing wordpress install. If it's
# found, then it will analyse it's contents and will
# link assets like this:
#
# data/wp-content folder symlinked
# data/.htaccess symlinked
# data/init.sh script initialized

RUN apt-get update
RUN apt-get -y upgrade
Expand Down Expand Up @@ -42,9 +34,8 @@ RUN chown -R www-data:www-data /app
# Use our default config
ADD wp-config.php /app/wp-config.php

# Initialize custom config from volume
ADD volume-init.sh /volume-init.sh
RUN chmod 755 /volume-init.sh
# Initialize volume
VOLUME /app/wp-content

# Configure and start apache
ADD vhost.conf /etc/apache2/sites-enabled/000-default.conf
Expand Down
3 changes: 0 additions & 3 deletions run.sh
@@ -1,8 +1,5 @@
#!/bin/bash

# See if volume needs initializing
/volume-init.sh

read pid cmd state ppid pgrp session tty_nr tpgid rest < /proc/self/stat
trap "kill -TERM -$pgrp; exit" EXIT TERM KILL SIGKILL SIGTERM SIGQUIT

Expand Down
33 changes: 0 additions & 33 deletions volume-init.sh

This file was deleted.

4 changes: 0 additions & 4 deletions wp-config.php 100644 → 100755
Expand Up @@ -13,10 +13,6 @@

define('FS_METHOD', 'direct');

#define('WP_HOME','http://usblog.triumph.com');
#define('WP_SITEURL','http://usblog.triumph.com');


$table_prefix = 'wp_';

define('WP_DEBUG', false);
Expand Down

0 comments on commit e3efd66

Please sign in to comment.