Skip to content

Commit 9f3620c

Browse files
authored
Merge pull request #67 from creativecommons/support-staff-migrate
Better support staff migrate script
2 parents 23baf97 + b6abfed commit 9f3620c

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ RUN chown -R www-data:www-data /var/www/.wp-cli
8888

8989

9090
# Create the index directory and set permissions
91-
RUN mkdir -p /var/www/index
91+
RUN mkdir -p /var/www/index/wp-content/uploads
9292
RUN chown -R www-data:www-data /var/www/index
9393

9494

9595
# Use WP-CLI to intall WordPress
9696
USER www-data
9797
WORKDIR /var/www/index
98-
ARG WP_VERSION
98+
ARG WP_VERSION
9999
RUN wp core download --version=$WP_VERSION
100100

101101
# Add WordPress basic configuration

config/startupservice.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/bin/bash
2+
set -o errexit
3+
set -o nounset
4+
5+
# https://en.wikipedia.org/wiki/ANSI_escape_code
6+
E0="$(printf "\e[0m")" # reset
7+
E1="$(printf "\e[1m")" # bold
28

39
/sbin/apache2ctl -v
4-
echo 'Starting webserver: http://127.0.0.1:8080'
10+
echo "${E1}Starting webserver: http://127.0.0.1:8080${E0}"
511
# Start Apache in the foreground
612
/sbin/apache2ctl -D FOREGROUND -k start

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
container_name: index-web
1414
depends_on:
1515
- index-db
16-
build:
16+
build:
1717
args:
1818
WP_VERSION: ${WP_VERSION}
1919
context: .

0 commit comments

Comments
 (0)