generator-reshow 0.17.76 → 0.17.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,18 +3,24 @@ version: 2.1
|
|
|
3
3
|
commands:
|
|
4
4
|
install-docker-buildx:
|
|
5
5
|
description: Install Docker Buildx
|
|
6
|
+
parameters:
|
|
7
|
+
docker-tag:
|
|
8
|
+
type: string
|
|
9
|
+
buildx-version:
|
|
10
|
+
type: string
|
|
11
|
+
default: v0.11.2
|
|
6
12
|
steps:
|
|
7
13
|
- run:
|
|
8
14
|
name: Install Docker Buildx
|
|
9
15
|
command: |
|
|
10
16
|
mkdir -vp ~/.docker/cli-plugins/
|
|
11
|
-
curl --silent -L "https://github.com/docker/buildx/releases/download
|
|
17
|
+
curl --silent -L "https://github.com/docker/buildx/releases/download/<< parameters.buildx-version >>/buildx-<< parameters.buildx-version >>.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
|
|
12
18
|
chmod a+x ~/.docker/cli-plugins/docker-buildx
|
|
13
19
|
docker buildx version
|
|
14
20
|
sudo apt-get update && sudo apt-get install -y binfmt-support qemu-user-static
|
|
15
21
|
docker run --rm --privileged tonistiigi/binfmt --install arm64
|
|
16
22
|
docker context create buildcontext
|
|
17
|
-
docker buildx create buildcontext --use
|
|
23
|
+
docker buildx create --name joyful-<< parameters.docker-tag >>- --append buildcontext --use
|
|
18
24
|
|
|
19
25
|
executors:
|
|
20
26
|
docker-publisher:
|
|
@@ -29,7 +35,7 @@ jobs:
|
|
|
29
35
|
steps:
|
|
30
36
|
- checkout
|
|
31
37
|
- setup_remote_docker:
|
|
32
|
-
version: 20.10.
|
|
38
|
+
version: 20.10.24
|
|
33
39
|
docker_layer_caching: true
|
|
34
40
|
- run:
|
|
35
41
|
name: "Test with terratest"
|
|
@@ -51,9 +57,6 @@ jobs:
|
|
|
51
57
|
- run:
|
|
52
58
|
name: Log time
|
|
53
59
|
command: date
|
|
54
|
-
- run:
|
|
55
|
-
name: Get Rate Limit
|
|
56
|
-
command: ./compile.sh rate
|
|
57
60
|
- run:
|
|
58
61
|
name: Gen Docker file
|
|
59
62
|
command: |
|
|
@@ -71,10 +74,8 @@ jobs:
|
|
|
71
74
|
cat ${BUILD_FOLDER}/$file
|
|
72
75
|
echo ""
|
|
73
76
|
done
|
|
74
|
-
- install-docker-buildx
|
|
75
|
-
|
|
76
|
-
name: login
|
|
77
|
-
command: ./compile.sh login
|
|
77
|
+
- install-docker-buildx:
|
|
78
|
+
docker-tag: << parameters.docker-tag >>
|
|
78
79
|
- run:
|
|
79
80
|
name: build Docker image
|
|
80
81
|
command: |
|
|
@@ -93,9 +94,17 @@ jobs:
|
|
|
93
94
|
LATEST_TAG="-t $IMAGE_NAME:latest"
|
|
94
95
|
fi
|
|
95
96
|
echo "Build ARGS: ${BUILD_ARG}"
|
|
97
|
+
docker pull $IMAGE_NAME:${BUILD_VERSION} || true
|
|
96
98
|
docker buildx inspect --bootstrap
|
|
99
|
+
echo "# ------ Start to Login ------ #"
|
|
100
|
+
./compile.sh login
|
|
101
|
+
./compile.sh rate
|
|
102
|
+
echo "# ------ End to Login ------ #"
|
|
97
103
|
docker buildx build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
|
|
104
|
+
--cache-to=type=inline,mode=all \
|
|
105
|
+
--cache-from $IMAGE_NAME:${BUILD_VERSION} \
|
|
98
106
|
--push \
|
|
107
|
+
--progress=plain \
|
|
99
108
|
--platform linux/amd64,linux/arm64/v8 \
|
|
100
109
|
-t $IMAGE_NAME:${BUILD_VERSION} ${LATEST_TAG} \
|
|
101
110
|
./${BUILD_FOLDER}
|
package/generators/npm/index.js
CHANGED
|
@@ -55,7 +55,7 @@ module.exports = class extends YoGenerator {
|
|
|
55
55
|
writing() {
|
|
56
56
|
this.env.options.nodePackageManager = "yarn";
|
|
57
57
|
const { cp, chMainName } = YoHelper(this);
|
|
58
|
-
const { isUseBabel, isUseBabelUI } = this.payload || {};
|
|
58
|
+
const { isUseBabel, isUseBabelUI, babelRootMode } = this.payload || {};
|
|
59
59
|
|
|
60
60
|
// handle change to new folder
|
|
61
61
|
chMainName(this.mainName);
|
|
@@ -64,7 +64,9 @@ module.exports = class extends YoGenerator {
|
|
|
64
64
|
cp("README.md", null, this.payload);
|
|
65
65
|
cp(".gitignore", null, this.payload);
|
|
66
66
|
if (isUseBabel) {
|
|
67
|
-
|
|
67
|
+
if (null == babelRootMode) {
|
|
68
|
+
cp("babel.config.js");
|
|
69
|
+
}
|
|
68
70
|
if (isUseBabelUI) {
|
|
69
71
|
cp("ui-src", "src");
|
|
70
72
|
cp("UITest.js", "src/ui/pages/__tests__/IndexTest.js", this.payload);
|
package/package.json
CHANGED