Compare commits
3 Commits
master
...
e6d989515f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6d989515f | ||
|
|
80b94db7ba | ||
|
|
3148f1430c |
@@ -11,6 +11,7 @@ uid_gid=$(get_service_base_image_dir_uid_gid "$MASTER_TARGET_SERVICE_NAME" /var/
|
|||||||
gid="${uid_gid#* }"
|
gid="${uid_gid#* }"
|
||||||
|
|
||||||
dirs=(
|
dirs=(
|
||||||
|
/var/tmp/opensem/media-library
|
||||||
/var/cache/opensem/bootstrap
|
/var/cache/opensem/bootstrap
|
||||||
/var/cache/opensem/framework
|
/var/cache/opensem/framework
|
||||||
/var/cache/opensem/views
|
/var/cache/opensem/views
|
||||||
@@ -56,6 +57,7 @@ fi
|
|||||||
service:docker-compose:directive-merge "$MASTER_TARGET_SERVICE_NAME" <<EOF
|
service:docker-compose:directive-merge "$MASTER_TARGET_SERVICE_NAME" <<EOF
|
||||||
volumes:
|
volumes:
|
||||||
- $OPENSEM_CODE:/opt/apps/$SERVICE_NAME:ro
|
- $OPENSEM_CODE:/opt/apps/$SERVICE_NAME:ro
|
||||||
|
- $SERVICE_DATASTORE/var/tmp/opensem/media-library:/opt/apps/$SERVICE_NAME/storage/media-library/temp:rw
|
||||||
- $SERVICE_DATASTORE/var/cache/opensem/bootstrap:/opt/apps/$SERVICE_NAME/bootstrap/cache:rw
|
- $SERVICE_DATASTORE/var/cache/opensem/bootstrap:/opt/apps/$SERVICE_NAME/bootstrap/cache:rw
|
||||||
- $SERVICE_DATASTORE/var/cache/opensem/framework:/opt/apps/$SERVICE_NAME/storage/framework/cache:rw
|
- $SERVICE_DATASTORE/var/cache/opensem/framework:/opt/apps/$SERVICE_NAME/storage/framework/cache:rw
|
||||||
- $SERVICE_DATASTORE/var/cache/opensem/views:/opt/apps/$SERVICE_NAME/storage/framework/views:rw
|
- $SERVICE_DATASTORE/var/cache/opensem/views:/opt/apps/$SERVICE_NAME/storage/framework/views:rw
|
||||||
|
|||||||
@@ -5,3 +5,6 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
mv -v "${OPENSEM_CONFIG_FILE}" "${OPENSEM_CONFIG_FILE%.prepare}"
|
mv -v "${OPENSEM_CONFIG_FILE}" "${OPENSEM_CONFIG_FILE%.prepare}"
|
||||||
|
|
||||||
|
artisan migrate -v --force &&
|
||||||
|
artisan migrate -v --path=database/migrations/shop --force
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
OPENSEM_DIR="/opt/apps/opensem"
|
OPENSEM_DIR="/opt/apps/opensem"
|
||||||
OPENSEM_CODE="$SERVICE_CONFIGSTORE$OPENSEM_DIR"
|
OPENSEM_CODE="$SERVICE_CONFIGSTORE$OPENSEM_DIR"
|
||||||
OPENSEM_RELEASE=1.0.0-rc.5
|
OPENSEM_RELEASE=1.0.0-rc.6
|
||||||
OPENSEM_URL=https://docker.0k.io/downloads/opensem-"${OPENSEM_RELEASE}".tar.xz
|
OPENSEM_URL=https://docker.0k.io/downloads/opensem-"${OPENSEM_RELEASE}".tar.xz
|
||||||
OPENSEM_CONFIG_FILE="${OPENSEM_CODE}"/.env.prepare
|
OPENSEM_CONFIG_FILE="${OPENSEM_CODE}"/.env.prepare
|
||||||
|
|
||||||
@@ -111,16 +111,12 @@ artisan() {
|
|||||||
export COMPOSE_IGNORE_ORPHANS=true
|
export COMPOSE_IGNORE_ORPHANS=true
|
||||||
|
|
||||||
php_fpm_service=$(service:traverse "$SERVICE_NAME":php-fpm) || return 1
|
php_fpm_service=$(service:traverse "$SERVICE_NAME":php-fpm) || return 1
|
||||||
## We don't want post deploy that is doing the final http initialization.
|
launch_docker_compose run \
|
||||||
compose --debug -q --no-init --no-post-deploy --no-pre-deploy \
|
|
||||||
--without-relation="$SERVICE_NAME":publish-dir \
|
|
||||||
run \
|
|
||||||
"${artisan_docker_run_opts[@]}" \
|
|
||||||
-T --rm -w /opt/apps/"$SERVICE_NAME" \
|
-T --rm -w /opt/apps/"$SERVICE_NAME" \
|
||||||
--entrypoint php \
|
--entrypoint php \
|
||||||
-u www-data "$php_fpm_service" artisan "$@" | cat
|
-u www-data "$php_fpm_service" artisan "$@"
|
||||||
|
|
||||||
return "${PIPESTATUS[0]}"
|
return "$?"
|
||||||
}
|
}
|
||||||
|
|
||||||
dotenv:quote() {
|
dotenv:quote() {
|
||||||
|
|||||||
Reference in New Issue
Block a user