Skip to content

Commit bd341db

Browse files
committed
Add build from config support (craft command)
1 parent 455ed7d commit bd341db

19 files changed

+922
-325
lines changed

.editorconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false
13+
14+
[*.{yml,yaml, vue}]
15+
indent_size = 2

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,7 @@ packlib_files.txt
4747
/docs/.vitepress/cache/
4848
package-lock.json
4949
pnpm-lock.yaml
50+
51+
# craft.log
52+
craft.log
53+
craft.yml

bin/spc-alpine-docker

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env sh
22

33
# This file is using docker to run commands
4+
SPC_DOCKER_VERSION=v3
45

56
# Detect docker can run
67
if ! which docker >/dev/null; then
@@ -50,9 +51,9 @@ else
5051
fi
5152

5253
# Detect docker env is setup
53-
if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-$SPC_USE_ARCH-v2; then
54+
if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION; then
5455
echo "Docker container does not exist. Building docker image ..."
55-
$DOCKER_EXECUTABLE build -t cwcc-spc-$SPC_USE_ARCH-v2 -f- . <<EOF
56+
$DOCKER_EXECUTABLE build -t cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION -f- . <<EOF
5657
FROM $ALPINE_FROM
5758
$SPC_USE_MIRROR
5859
RUN apk update; \
@@ -116,6 +117,9 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/source:/app/source"
116117
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/dist:/app/dist"
117118
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/downloads:/app/downloads"
118119
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
120+
if [ -f "$(pwd)/craft.yml" ]; then
121+
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/craft.yml:/app/craft.yml"
122+
fi
119123

120124
# Run docker
121125
# shellcheck disable=SC2068
@@ -136,7 +140,7 @@ if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then
136140
echo "* ./pkgroot: $(pwd)/pkgroot"
137141
echo "*"
138142

139-
$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-v2
143+
$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION
140144
else
141-
$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-v2 bin/spc $@
145+
$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
142146
fi

bin/spc-gnu-docker

+3
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/source:/app/source"
129129
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/dist:/app/dist"
130130
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/downloads:/app/downloads"
131131
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
132+
if [ -f "$(pwd)/craft.yml" ]; then
133+
MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/craft.yml:/app/craft.yml"
134+
fi
132135

133136
# Apply env in temp env file
134137
echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' > /tmp/spc-gnu-docker.env

composer.json

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
"ext-zlib": "*",
1515
"laravel/prompts": "^0.1.12",
1616
"symfony/console": "^5.4 || ^6 || ^7",
17+
"symfony/process": "^7.2",
18+
"symfony/yaml": "^7.2",
1719
"zhamao/logger": "^1.0"
1820
},
1921
"require-dev": {

0 commit comments

Comments
 (0)