@fishawack/lab-env 4.43.0 → 4.44.0-beta.1

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  ## Changelog
2
2
 
3
+ ### 4.44.0-beta.1 (2025-08-15)
4
+
5
+ #### Features
6
+
7
+ * added capture webdriverio ai file ([66ef769](https://bitbucket.org/fishawackdigital/lab-env/commits/66ef7691dd48ba209d1425a27b03cd1fe20205a6))
8
+ * enable ssh cloning via php container ([cb47b41](https://bitbucket.org/fishawackdigital/lab-env/commits/cb47b417a832d998d82f4c1e1faef0c2ab33f67f))
9
+
3
10
  ### 4.43.0 (2025-08-10)
4
11
 
5
12
  #### Features
@@ -0,0 +1,232 @@
1
+ ---
2
+ applyTo: "_Node/capture.js,_Node/capture-*.js,_Node/capture/**/*.js"
3
+ ---
4
+
5
+ # Project Overview
6
+
7
+ This project uses WebDriverIO v9 for automated screenshot capture across multiple browsers, viewport sizes, and device emulations. The capture system is designed to generate consistent visual regression testing screenshots by hooking into a test runner that iterates through configured pages and viewport configurations.
8
+
9
+ The `_Node/capture.js` file serves as the entry point for custom capture logic, allowing projects to extend the default screenshot behavior with page-specific interactions, element manipulation, and additional test scenarios.
10
+
11
+ ## Folder Structure
12
+
13
+ ```
14
+ _Node/
15
+ ├── capture.js # Main capture customization file
16
+ ├── capture-*.js # Additional capture files (if needed)
17
+ └── capture/ # Capture-related modules directory
18
+ └── **/*.js # Nested capture modules
19
+ ```
20
+
21
+ The capture system automatically loads the first available file:
22
+
23
+ 1. `_Node/level-0/capture.js` (if exists)
24
+ 2. `_Node/capture.js` (fallback)
25
+
26
+ ## Libraries and Frameworks
27
+
28
+ ### WebDriverIO v9
29
+
30
+ - **Browser Control**: Uses WebDriverIO's browser object for page interaction
31
+ - **Element Selection**: Supports CSS selectors and XPath for element targeting
32
+ - **Screenshot Capture**: Utilizes BiDi capabilities for full-page and viewport-only screenshots
33
+ - **Device Emulation**: Supports both manual viewport sizing and device emulation profiles
34
+
35
+ ### Test Runner Integration
36
+
37
+ - Built on a test framework using `describe()` and `it()` blocks
38
+ - All custom interactions must be wrapped in `it()` test blocks
39
+ - Tests run asynchronously after being mapped out synchronously
40
+
41
+ ## Coding Standards
42
+
43
+ ### Module Structure
44
+
45
+ ```javascript
46
+ module.exports = {
47
+ // Called after viewport resize, before page iteration
48
+ size: (capture) => {
49
+ // Add dynamic pages to capture.page.array
50
+ // Access to capture.size properties
51
+ },
52
+
53
+ // Called after default page capture for each page
54
+ page: (capture) => {
55
+ // Wrap all interactions in it() blocks
56
+ // Access to capture.page and capture.screenshot
57
+ },
58
+ };
59
+ ```
60
+
61
+ ### Error Handling
62
+
63
+ - Let screenshot processes fail if expected selectors don't exist
64
+ - Failing tests indicate markup changes that need attention
65
+ - Avoid silent failures that could mask site issues
66
+
67
+ ### Asynchronous Operations
68
+
69
+ ```javascript
70
+ // Always use async/await for browser interactions
71
+ it("Test Description", async () => {
72
+ await browser.click(".selector");
73
+ await browser.pause(1000);
74
+ await capture.screenshot.call();
75
+ });
76
+ ```
77
+
78
+ ### Element Waiting
79
+
80
+ ```javascript
81
+ // Wait for specific elements before interaction
82
+ await $(".selector").waitForExist(50000);
83
+
84
+ // Use hard-coded waits sparingly
85
+ await browser.pause(1000);
86
+ ```
87
+
88
+ ### Page-Specific Logic
89
+
90
+ ```javascript
91
+ // Target specific pages using route comparison
92
+ if (capture.page.route === "/") {
93
+ // Homepage-only logic
94
+ }
95
+
96
+ if (capture.page.route === "/products") {
97
+ // Products page logic
98
+ }
99
+ ```
100
+
101
+ ## UI Guidelines
102
+
103
+ ### Screenshot Capture Methods
104
+
105
+ #### Full Page Screenshots (Default)
106
+
107
+ ```javascript
108
+ // Captures entire scrollable page content
109
+ await capture.screenshot.call();
110
+ // or explicitly
111
+ await capture.screenshot.call(false);
112
+ ```
113
+
114
+ #### Viewport-Only Screenshots
115
+
116
+ ```javascript
117
+ // Captures only visible viewport area
118
+ await capture.screenshot.call(true);
119
+ ```
120
+
121
+ ### Common UI Interaction Patterns
122
+
123
+ #### Removing Overlay Elements
124
+
125
+ ```javascript
126
+ it("Remove Modal Overlays", async () => {
127
+ await browser.execute(() => {
128
+ // Remove ISI trays
129
+ const isi = document.querySelector(".cmp-isi-tray");
130
+ if (isi) isi.remove();
131
+
132
+ // Remove cookie banners
133
+ const cookies = document.querySelector(".cookie-banner");
134
+ if (cookies) cookies.remove();
135
+
136
+ // Remove any modal overlays
137
+ const modals = document.querySelectorAll(".modal-overlay, .popup");
138
+ modals.forEach((modal) => modal.remove());
139
+ });
140
+ });
141
+ ```
142
+
143
+ #### Carousel Interaction
144
+
145
+ ```javascript
146
+ it("Capture Carousel States", async () => {
147
+ const slides = await $$(".carousel-slide");
148
+
149
+ for (let i = 0; i < slides.length; i++) {
150
+ await browser.click(".carousel-next");
151
+ await browser.pause(500); // Allow transition
152
+ await capture.screenshot.call(true); // Viewport only
153
+ }
154
+ });
155
+ ```
156
+
157
+ #### Accordion Toggling
158
+
159
+ ```javascript
160
+ it("Capture Accordion States", async () => {
161
+ const accordions = await $$(".accordion-header");
162
+
163
+ for (const accordion of accordions) {
164
+ await accordion.click();
165
+ await browser.pause(300); // Allow expansion
166
+ await capture.screenshot.call(true); // Viewport only
167
+ }
168
+ });
169
+ ```
170
+
171
+ #### Navigation States
172
+
173
+ ```javascript
174
+ it("Navigation Menu", async () => {
175
+ // Open navigation
176
+ await browser.click(".js-menu");
177
+ await $(".navigation").waitForDisplayed();
178
+
179
+ // Capture viewport only to avoid scrolling
180
+ await capture.screenshot.call(true);
181
+ });
182
+ ```
183
+
184
+ ### Dynamic Page Generation
185
+
186
+ ```javascript
187
+ size: (capture) => {
188
+ // Add dynamic routes from router configuration
189
+ const dynamicRoutes = require("../_Build/js/libs/routes.js");
190
+
191
+ dynamicRoutes.forEach((route) => {
192
+ capture.page.array.push(route.path);
193
+ });
194
+
195
+ // Add programmatically generated pages
196
+ const productIds = ["product-1", "product-2", "product-3"];
197
+ productIds.forEach((id) => {
198
+ capture.page.array.push(`/products/${id}`);
199
+ });
200
+ };
201
+ ```
202
+
203
+ ### Responsive Element Handling
204
+
205
+ ```javascript
206
+ it("Handle Responsive Elements", async () => {
207
+ // Check if mobile navigation exists
208
+ const mobileNav = await $(".mobile-nav");
209
+ if (await mobileNav.isDisplayed()) {
210
+ await mobileNav.click();
211
+ await capture.screenshot.call(true);
212
+ }
213
+
214
+ // Check if desktop navigation exists
215
+ const desktopNav = await $(".desktop-nav");
216
+ if (await desktopNav.isDisplayed()) {
217
+ await desktopNav.click();
218
+ await capture.screenshot.call(true);
219
+ }
220
+ });
221
+ ```
222
+
223
+ ### Best Practices
224
+
225
+ - Use descriptive `it()` block names for clear test identification
226
+ - Screenshot naming is handled automatically - don't override
227
+ - Prefer viewport screenshots (`true`) for UI state variations
228
+ - Use full page screenshots (`false`/omitted) for complete page captures
229
+ - Wait for elements/animations to complete before capturing
230
+ - Remove interfering UI elements (modals, banners) before main capture
231
+ - Leverage `capture.page.route` for page-specific logic
232
+ - Add dynamic pages in the `size()` method to ensure they're captured across all configurations
package/globals.js CHANGED
@@ -557,18 +557,20 @@ if (!existsSync(path.join(cwd, "stylelint.config.js"))) {
557
557
  );
558
558
  }
559
559
 
560
+ // Copy AI instructions file
561
+ const destDir = path.join(cwd, ".github/instructions");
562
+ if (!existsSync(destDir)) {
563
+ mkdirSync(destDir, { recursive: true });
564
+ }
565
+
560
566
  // Copy AI instructions file
561
567
  if (
562
568
  (platform === "laravel" && process.env.VERSION_LARAVEL === "10") ||
563
569
  platform === "php"
564
570
  ) {
565
- const destDir = path.join(cwd, ".github/copilot");
566
- if (!existsSync(destDir)) {
567
- mkdirSync(destDir, { recursive: true });
568
- }
569
571
  copyFileSync(
570
572
  path.join(__dirname, "_Ai/laravel-12.md"),
571
- path.join(destDir, "instructions.md"),
573
+ path.join(destDir, "laravel.instructions.md"),
572
574
  );
573
575
  }
574
576
 
@@ -577,16 +579,17 @@ if (
577
579
  pkg?.dependencies?.["vue"] &&
578
580
  semver.satisfies(semver.coerce(pkg.dependencies["vue"]), "3.x")
579
581
  ) {
580
- const destDir = path.join(cwd, ".github/copilot");
581
- if (!existsSync(destDir)) {
582
- mkdirSync(destDir, { recursive: true });
583
- }
584
582
  copyFileSync(
585
583
  path.join(__dirname, "_Ai/vue-3.md"),
586
- path.join(destDir, "instructions.md"),
584
+ path.join(destDir, "vue.instructions.md"),
587
585
  );
588
586
  }
589
587
 
588
+ copyFileSync(
589
+ path.join(__dirname, "_Ai/webdriveriov9-capture.md"),
590
+ path.join(destDir, "webdriverio-capture.instructions.md"),
591
+ );
592
+
590
593
  // If docker-compose.yml exists in project _Docker folder append to end
591
594
  let localOverride = "";
592
595
  if (existsSync(path.join(cwd, "_Docker/docker-compose.yml"))) {
@@ -36,6 +36,7 @@ services:
36
36
  volumes:
37
37
  - $CWD/:/app
38
38
  - vendor:/app/vendor
39
+ - $FW_DIR/.ssh:/home/php/.ssh
39
40
  environment:
40
41
  - FW_ROOT=${FW_ROOT:-}
41
42
  - USER_UID=${USER_UID:-0}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fishawack/lab-env",
3
- "version": "4.43.0",
3
+ "version": "4.44.0-beta.1",
4
4
  "description": "Docker manager for FW",
5
5
  "main": "cli.js",
6
6
  "scripts": {
@@ -1,136 +0,0 @@
1
- ## Changelog
2
-
3
- ### 1.8.0 (2025-08-10)
4
-
5
- #### Features
6
-
7
- * new env flag for remote browsers ([f313be6](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/f313be6cde14e05ac832b43127b6c5639fd62015))
8
-
9
- ### 1.8.0-beta.1 (2025-08-10)
10
-
11
- #### Features
12
-
13
- * new env flag for remote browsers ([f313be6](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/f313be6cde14e05ac832b43127b6c5639fd62015))
14
-
15
- ### 1.7.2 (2025-05-15)
16
-
17
- #### Bug Fixes
18
-
19
- * use n flag in symlink to override if symlink already exists ([cdc1a41](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/cdc1a41639785f65e2076477f33e86a8ea8cb8fa))
20
-
21
- ### 1.7.2-beta.1 (2025-05-15)
22
-
23
- #### Bug Fixes
24
-
25
- * use n flag in symlink to override if symlink already exists ([cdc1a41](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/cdc1a41639785f65e2076477f33e86a8ea8cb8fa))
26
-
27
- ### 1.7.1 (2025-05-15)
28
-
29
- #### Reverts
30
-
31
- * Revert "feat: installed husky npm module globally" ([91cc456](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/91cc4564ea2fd6650924732a2a75cb4a9fb749b5))
32
-
33
- ### 1.7.1-beta.1 (2025-05-14)
34
-
35
- #### Reverts
36
-
37
- * Revert "feat: installed husky npm module globally" ([91cc456](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/91cc4564ea2fd6650924732a2a75cb4a9fb749b5))
38
-
39
- ### 1.7.0 (2025-05-14)
40
-
41
- #### Features
42
-
43
- * installed husky npm module globally ([e08f5a7](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e08f5a7850d0743137c26addf694f586c8c8ee74))
44
- * updated node from 20 to 22 ([e592f6e](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e592f6e93fc6554227f8902c8c1c21a3564a32ce))
45
-
46
- ### 1.7.0-beta.1 (2025-05-14)
47
-
48
- #### Features
49
-
50
- * installed husky npm module globally ([e08f5a7](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e08f5a7850d0743137c26addf694f586c8c8ee74))
51
- * updated node from 20 to 22 ([e592f6e](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e592f6e93fc6554227f8902c8c1c21a3564a32ce))
52
-
53
- ### 1.6.0 (2024-10-22)
54
-
55
- #### Features
56
-
57
- * own global node_modules folder so local modules can be linked ([82f84fa](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/82f84faa5dfa7c009458bec4fe3a9f2b437c34bf))
58
-
59
- ### 1.5.2 (2024-10-08)
60
-
61
- #### Bug Fixes
62
-
63
- * rclone in alpine image and aws sdk back in full image as rclone used for s3 content ([9e68463](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/9e684631bb83c105aa9e5407e8fee30a788309cd))
64
-
65
- ### 1.5.1 (2024-10-07)
66
-
67
- #### Bug Fixes
68
-
69
- * move aws from full image to alpine now that s3 content requests are supported ([a947817](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/a94781756ea482545b63018e72ab30ce25727af9))
70
-
71
- ### 1.5.0 (2024-10-01)
72
-
73
- #### Features
74
-
75
- * commit into lab-env and create pull request against development on publish ([22e9c66](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/22e9c666dff1e6453090da472a6cd4f0b89c6fbb))
76
-
77
- #### Bug Fixes
78
-
79
- * close source branch by default on pull request ([5208373](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/5208373822272c648a547f9b328720cb4fdf9bd4))
80
-
81
- ### 1.4.2 (2024-10-01)
82
-
83
- #### Bug Fixes
84
-
85
- * trigger ci ([301d679](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/301d6795162f0bf8941a3b9413a30092a3e8bf21))
86
-
87
- ### 1.4.1 (2024-07-17)
88
- * [fix] set global var for git across file system so git avail in mounted volumes i.e node_modules
89
-
90
- ### 1.4.0 (2024-06-04)
91
- * [feat] bumped node from 18 to 20
92
-
93
- ### 1.3.3 (2024-02-09)
94
- * [fix] symlink wine64 now htat wine is the default global command but electron expects wine64
95
-
96
- ### 1.3.2 (2024-01-24)
97
- * [fix] install latest eb cli and use node images python rather than pyenv
98
-
99
- ### 1.3.1 (2024-01-22)
100
- * [fix] rebuild of image to get the latest chromium version to fix new puppeteer headless mode
101
-
102
- ### 1.3.0 (2023-03-17)
103
- * [feat] node user is now added to www-data group for easier file permission management
104
- * [fix] disable npm message about update being available
105
-
106
- ### 1.2.2 (2023-02-25)
107
- * [fix] set BRANCH and CI_COMMIT_REF_NAME env variables in container
108
- * [fix] installed git-branch to fetch the current branch for deployment targets
109
- * [refactor] moved global node module symlinking to alpine image for future use
110
-
111
- ### 1.2.1 (2023-02-25)
112
- * [fix] install eb cli into root of image rather than root user directory
113
- * [perf] dont recurse and dont change group of node_modules to speed up command
114
- * [refactor] set node git flag without switching user directly in dockerfile
115
-
116
- ### 1.1.4 (2023-02-23)
117
- * [Fix] Installed missing are-you-es5 global npm module
118
- * [Fix] Installed missing check-dependencies global npm module
119
-
120
- ### 1.1.3 (2023-02-23)
121
- * [Fix] Switch to ENV for $PATH updates to avoid shell profile loading issues
122
- * [Fix] Moved chromium to alpine image as its needed for svg tasks and testing
123
-
124
- ### 1.1.2 (2023-02-22)
125
- * [Fix] cd into $PWD after su command or we'll start in users home directory
126
-
127
- ### 1.1.1 (2023-02-22)
128
- * [Fix] Use -l login flag for su command for both non interactive and interactive shells
129
- * [Fix] Switch $PATH writes to .profile so they are executed on non interactive shells
130
-
131
- ### 1.1.0 (2023-02-22)
132
- * [Feature] Watertight now baked into image so not needed in package.json of projects
133
- * [Fix] lftp installed in alpine image as it's needed for content tasks
134
-
135
- ### 1.0.0 (2023-02-21)
136
- * [Misc] initial commit
package/core/1/Dockerfile DELETED
@@ -1,113 +0,0 @@
1
- #####
2
- # Alpine image
3
- #####
4
-
5
- FROM node:22 AS alpine
6
-
7
- LABEL org.opencontainers.image.authors="Mike Mellor <mike.mellor@avalerehealth.com>"
8
-
9
- ARG TARGETARCH
10
-
11
- WORKDIR /app
12
-
13
- EXPOSE 3000
14
- EXPOSE 3001
15
-
16
- # Get latest apt-get
17
- RUN apt-get update
18
-
19
- # Update npm to latest
20
- RUN npm install -g npm@latest
21
-
22
- # Install dart sass vm (arch switch)
23
- RUN curl -L -o /sass.tar.gz https://github.com/sass/dart-sass/releases/download/1.57.1/dart-sass-1.57.1-linux-$(if [ "$TARGETARCH" = "arm64" ]; then echo 'arm64'; else echo 'x64'; fi).tar.gz
24
- RUN tar -xf /sass.tar.gz -C /
25
- ENV PATH="${PATH}:/dart-sass/"
26
- RUN rm -rf /sass.tar.gz
27
-
28
- # Set safe directory to remove intel errors when running git rev-parse
29
- RUN su node -c "git config --global --add safe.directory /app"
30
-
31
- # Also set global git flag for allowing access across filesystems for mounted node_modules dir
32
- ENV GIT_DISCOVERY_ACROSS_FILESYSTEM=1
33
-
34
- # Disable npm message about updates being available
35
- RUN su node -c "npm config set update-notifier false"
36
-
37
- # Add node user to www-data group
38
- RUN usermod -a -G www-data node
39
-
40
- # Install lftp
41
- RUN apt-get install -y lftp
42
-
43
- # Install chromium
44
- RUN apt-get install -y chromium fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
45
- # Stop Puppeteer downloading browsers during npm install
46
- ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
47
- ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
48
-
49
- # Install package.json checker
50
- RUN npm install check-dependencies -g
51
-
52
- # Install node_modules checker
53
- RUN npm install are-you-es5 -g
54
-
55
- # Install git branch fetcher
56
- RUN npm install git-branch -g
57
-
58
- # Link root global node_modules to ~/.node_modules
59
- RUN ln -s /usr/local/lib/node_modules/ /home/node/.node_modules
60
-
61
- # Install rclone
62
- RUN curl https://rclone.org/install.sh | bash
63
-
64
- # Cleanup apt-get install folders
65
- RUN apt-get clean && \
66
- rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
67
-
68
- COPY entrypoint.sh /bin/entrypoint.sh
69
- RUN chmod +x /bin/entrypoint.sh
70
- ENTRYPOINT ["/bin/entrypoint.sh"]
71
-
72
- #####
73
- # Full image
74
- #####
75
-
76
- FROM alpine AS full
77
-
78
- # Get latest apt-get
79
- RUN apt-get update
80
-
81
- # Install ghostscript
82
- RUN apt-get install -y ghostscript
83
-
84
- # Install zip
85
- RUN apt-get install zip
86
-
87
- # Install AWS Elastic Beanstalk cli
88
- ENV PATH="${PATH}:/.ebcli-virtual-env/executables"
89
- RUN apt-get -y install python-is-python3 python3-pip && \
90
- pip install virtualenv --break-system-packages && \
91
- git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git ~/aws-eb && \
92
- python ~/aws-eb/scripts/ebcli_installer.py --location / && \
93
- rm -rf ~/aws-eb
94
-
95
- # Install AWS-CLI@2 (arch switch)
96
- RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(if [ "$TARGETARCH" = "arm64" ]; then echo 'aarch64'; else echo 'x86_64'; fi).zip" -o "awscliv2.zip"
97
- RUN unzip awscliv2.zip
98
- RUN ./aws/install
99
- RUN rm -rf ./aws && rm -rf awscliv2.zip
100
-
101
- # Update electron globally
102
- RUN npm install -g electron-packager@latest
103
-
104
- # Install wine64
105
- RUN apt-get install -y wine64 && \
106
- ln -s /usr/bin/wine /usr/bin/wine64
107
-
108
- # Install watertight
109
- RUN --mount=type=ssh npm install -g git+ssh://git@bitbucket.org/fishawackdigital/watertight-node-auto.git#v6.0.0
110
-
111
- # Cleanup apt-get install folders
112
- RUN apt-get clean && \
113
- rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
package/core/1/README.md DELETED
@@ -1,9 +0,0 @@
1
- ## Background
2
-
3
- ### What
4
-
5
- The image used for core@8 and above.
6
-
7
- ### Why
8
-
9
- Allows us to automate the local developer & CI environments.
@@ -1,82 +0,0 @@
1
- definitions:
2
- services:
3
- docker:
4
- image: docker:dind
5
- memory: 12288
6
-
7
- pipelines:
8
- branches:
9
- master:
10
- - step:
11
- image: fishawack/aws-runner
12
- runs-on:
13
- - self.hosted
14
- - linux
15
- - production
16
- size: 4x
17
- script:
18
- # Install release deps
19
- - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
20
- # Release version via node so can exit out when no release made
21
- - |
22
- node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
23
- # Copy ssh keys so physical files exist for agent to use
24
- - cp /build/*/ssh/* ~/.ssh/
25
- # Start ssh agent and add all (if any) keys
26
- - eval `ssh-agent` && ssh-add || true
27
- # Publish docker image
28
- - docker login $DOCKER_CREDENTIALS && docker buildx create --use && npm run image
29
- # Sync beta after publish
30
- - git config --global user.email "digital@fishawack.com"
31
- - git config --global user.name "Digital Fishawack"
32
- - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout beta && git merge master && git push origin beta
33
- # Commit and create pull request for new version on lab-env repo
34
- - git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/lab-env
35
- - cd lab-env
36
- - git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/beta
37
- - git submodule init
38
- - git submodule update
39
- - git submodule update --remote --merge core/1
40
- - git add .
41
- - |
42
- git commit --allow-empty -m "build(core/1): Bumped $BITBUCKET_REPO_SLUG"
43
- - git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
44
- - |
45
- curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/lab-env/pullrequests \
46
- -u $GIT_CREDENTIALS \
47
- --header 'Content-Type: application/json' \
48
- --data "{
49
- \"title\": \"Bumped $BITBUCKET_REPO_SLUG\",
50
- \"destination\": {
51
- \"branch\": {
52
- \"name\": \"beta\"
53
- }
54
- },
55
- \"source\": {
56
- \"branch\": {
57
- \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
58
- }
59
- },
60
- \"reviewers\": [
61
- {
62
- \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
63
- }
64
- ],
65
- \"close_source_branch\": true
66
- }"
67
- services:
68
- - docker
69
- beta:
70
- - step:
71
- image: fishawack/aws-runner
72
- runs-on:
73
- - self.hosted
74
- - linux
75
- - production
76
- size: 4x
77
- script:
78
- # Install deps
79
- - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
80
- # Release version via node so can exit out when no release made
81
- - |
82
- node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
@@ -1,37 +0,0 @@
1
- services:
2
- core:
3
- build:
4
- context: $FW_CORE_1_CONTEXT
5
- target: $FW_CORE_1_TARGET
6
- ssh:
7
- - default
8
- args:
9
- target: $FW_CORE_1_TARGET
10
- target_image: $FW_CORE_1_TARGET_IMAGE
11
- image: $FW_CORE_1_IMAGE:${FW_CORE_1_VERSION:-latest}
12
- init: true
13
- tty: true
14
- volumes:
15
- - $CWD/:/app
16
- - $FW_DIR/targets:/home/node/targets
17
- - $FW_DIR/.ssh:/home/node/.ssh
18
- - $FW_DIR/.aws:/home/node/.aws
19
- - node_modules:/app/node_modules
20
- ports:
21
- - ${PORT:-3000}:${PORT:-3000}
22
- - ${PORT_OPT:-3001}:${PORT_OPT:-3001}
23
- environment:
24
- - REPO=${REPO:-}
25
- - PORT=${PORT:-3000}
26
- - PORT_OPT=${PORT_OPT:-3001}
27
- - PORT_WEB=${PORT_WEB:-8000}
28
- - PORT_DB=${PORT_DB:-3306}
29
- - USER_UID=${USER_UID:-0}
30
- - USER_GID=${USER_GID:-0}
31
- - FW_ROOT=${FW_ROOT:-}
32
- - BRANCH=${BRANCH:-}
33
- - CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME:-}
34
- - REMOTE_BROWSERS=${REMOTE_BROWSERS:-chrome}
35
- volumes:
36
- node_modules:
37
- driver: "local"
@@ -1,24 +0,0 @@
1
- #!/bin/bash
2
-
3
- # Setting $FW_ROOT will bypass the user switch to node
4
- if [ -z "$FW_ROOT" ]; then
5
- # Set node user id to match host users id so no permission issues outside of docker
6
- usermod -u $USER_UID node &>/dev/null
7
-
8
- # Own the node_modules folder otherwise it'll be owned by root/previous node id which will prevent writing
9
- chown node /app/node_modules
10
-
11
- # Own the global node_modules folder otherwise it'll be owned by root/previous node id which will prevent writing
12
- chown node /usr/local/lib/node_modules
13
-
14
- # Default arguments will always be bash -l, if nothing follows this just start an non login interactive shell
15
- if [ -z "${@:3}" ]; then
16
- exec su node
17
- # Otherwise pipe the command after the bash -lc into the non login non interactive shell as a command to exec
18
- else
19
- exec su node -c "${@:3}"
20
- fi
21
- else
22
- echo "Accessing as root"
23
- exec "$@"
24
- fi
@@ -1,47 +0,0 @@
1
- {
2
- "name": "core",
3
- "version": "1.8.0",
4
- "description": "lab-env docker config for the @fishawack/core/1 npm module",
5
- "scripts": {
6
- "setup": "ln -sfn ../../.commitlintrc.json .commitlintrc.json && ln -sfn ../../.editorconfig .editorconfig && ln -sfn ../../.prettierignore .prettierignore && ln -sfn ../../.husky/ .husky && husky &>/dev/null || true",
7
- "image": "docker buildx build --ssh default --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1:$npm_package_version -t fishawack/lab-env-core-1:latest --push . && docker buildx build --ssh default --target alpine --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1-alpine:$npm_package_version -t fishawack/lab-env-core-1-alpine:latest --push ."
8
- },
9
- "author": "Mike Mellor",
10
- "license": "ISC",
11
- "release": {
12
- "plugins": [
13
- [
14
- "@semantic-release/commit-analyzer",
15
- {
16
- "preset": "conventionalcommits"
17
- }
18
- ],
19
- [
20
- "@semantic-release/release-notes-generator",
21
- {
22
- "preset": "conventionalcommits",
23
- "writerOpts": {
24
- "headerPartial": "### {{version}} ({{date}})\n",
25
- "mainTemplate": "{{> header}}\n{{#each commitGroups}}\n\n{{#if title}}\n#### {{title}}\n\n{{/if}}\n{{#each commits}}\n{{> commit root=@root}}\n{{/each}}\n{{/each}}"
26
- },
27
- "presetConfig": {
28
- "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}"
29
- }
30
- }
31
- ],
32
- [
33
- "@semantic-release/changelog",
34
- {
35
- "changelogTitle": "## Changelog"
36
- }
37
- ],
38
- [
39
- "@semantic-release/npm",
40
- {
41
- "npmPublish": false
42
- }
43
- ],
44
- "@semantic-release/git"
45
- ]
46
- }
47
- }