Merge branch 'integration-remote-2-2-images' (d8c7071b) · Commits · e / devices / eOS Installer

.gitlab-ci.yml

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -21,15 +21,15 @@ docker-latest:
	- docker build -t $CI_REGISTRY_IMAGE:latest -f app/Dockerfile app		- docker build -t $CI_REGISTRY_IMAGE:latest -f app/Dockerfile app
	- docker push $CI_REGISTRY_IMAGE:latest		- docker push $CI_REGISTRY_IMAGE:latest
	when: manual		when: manual
	rules:		# rules:
	- if: '$CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE != "schedule"'		# - if: '$CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE != "schedule"'
	- if: $CI_PIPELINE_SOURCE == 'merge_request_event'		# - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

	trigger_deploy:		trigger_deploy:
	needs: ["docker-latest"]		needs: ["docker-latest"]
	rules:		# rules:
	- if: '$CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE != "schedule"'		# - if: '$CI_COMMIT_REF_NAME == "main" && $CI_PIPELINE_SOURCE != "schedule"'
	- if: $CI_PIPELINE_SOURCE == 'merge_request_event'		# - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
	trigger:		trigger:
	project: e/online-services/infra/web/web-easy-installer		project: e/online-services/infra/web/web-easy-installer
	branch: main		branch: main

README.md

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@ Go to the `app` folder.
	`docker run -v "%cd%"\src:/app/src -p 127.0.0.1:3000:3000 eos-web-installer`		`docker run -v "%cd%"\src:/app/src -p 127.0.0.1:3000:3000 eos-web-installer`

	## Linux		## Linux
	`docker run -v "${pwd}"\src:/app/src -p 127.0.0.1:3000:3000 eos-web-installer`		`docker run -v "$(pwd)/src:/app/src" -p 127.0.0.1:3000:3000 eos-web-installer`

	The project is available at `http://localhost:3000/`		The project is available at `http://localhost:3000/`

app/Dockerfile

+2 −2

Original line number	Original line	Diff line number	Diff line
	# syntax=docker/dockerfile:1		# syntax=docker/dockerfile:1

	FROM node:18-alpine		FROM node:22-alpine
	WORKDIR /app		WORKDIR /app
	COPY . .		COPY . .
	RUN yarn install --production		RUN yarn install --production

app/README.md

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@ Go to the `app` folder.
	`docker run -v "%cd%"\src:/app/src -p 127.0.0.1:3000:3000 eos-web-installer`		`docker run -v "%cd%"\src:/app/src -p 127.0.0.1:3000:3000 eos-web-installer`

	## Linux		## Linux
	`docker run -v "${pwd}"\src:/app/src -p 127.0.0.1:3000:3000 eos-web-installer`		`docker run -v "$(pwd)/src:/app/src" -p 127.0.0.1:3000:3000 eos-web-installer`

	The project is available at `http://localhost:3000/`		The project is available at `http://localhost:3000/`

	@@ -118,6 +118,11 @@ In case of unzip : the file is unzipped, and the retrieved files are stored in t
	#### Exemples		#### Exemples
	```		```
	{		{
			"android": 13,
			"security_patch_level": "2024-04-05",
			"steps": [
			...
			],
	"folder": [		"folder": [
	{		{
	"name": "recovery.img"		"name": "recovery.img"
	@@ -140,7 +145,9 @@ In case of unzip : the file is unzipped, and the retrieved files are stored in t
	}		}
	```		```

			* android: Android version (optional) => Display warning if version mistach (this is the minimal current version than needs to be present in order to continue process see: Before following these instructions please ensure that the device is on the latest Android 13.0.0 firmware))
			* security_patch_level (optional) => Allow to load safe procedure descriptor file (postfixed with '-safe' eg: 'teracube2e.json vs teracube2e-safe.json') that contain a specific install process (eg does not lock the bootloader if current_security_path_level > new_security_path_level new_security_path_level is the one the json file)
			* folder: must be an array

	## Vue		## Vue

app/package.json

+1 −15

Original line number	Original line	Diff line number	Diff line
	@@ -4,30 +4,16 @@
	"main": "index.js",		"main": "index.js",
	"license": "TBD",		"license": "TBD",
	"scripts": {		"scripts": {
	"prettify": "prettier -l --write \"*/.js\"",
	"test": "jest",
	"dev": "nodemon src/index.js"		"dev": "nodemon src/index.js"
	},		},
	"dependencies": {		"dependencies": {
	"express": "^4.18.2",		"express": "^4.18.2",
	"mysql2": "^2.3.3",
	"sqlite3": "^5.1.2",
	"uuid": "^9.0.0",
	"wait-port": "^1.0.4"		"wait-port": "^1.0.4"
	},		},
	"resolutions": {		"resolutions": {
	"ansi-regex": "5.0.1"		"ansi-regex": "5.0.1"
	},		},
	"prettier": {
	"trailingComma": "all",
	"tabWidth": 4,
	"useTabs": false,
	"semi": true,
	"singleQuote": true
	},
	"devDependencies": {		"devDependencies": {
	"jest": "^29.3.1",		"nodemon": "^2.0.20"
	"nodemon": "^2.0.20",
	"prettier": "^2.7.1"
	}		}
	}		}