diff --git a/Docker/compose.yaml b/Docker/compose.yaml index 5f0608b..e39e7c8 100644 --- a/Docker/compose.yaml +++ b/Docker/compose.yaml @@ -1,22 +1,22 @@ -services: - - # - # Less3 - # See https://hub.docker.com/r/jchristn/less3 - # and https://github.com/jchristn/less3 - # - - litegraph: - container_name: 'less3' - image: 'jchristn/less3:v2.1.11' - network_mode: 'host' - stdin_open: true - tty: true - volumes: - - ./system.json:/app/system.json - - ./less3.db:/app/less3.db - - ./logs/:/app/logs/ - - ./temp/:/app/temp/ - - ./disk/:/app/disk/ - healthcheck: - test: curl --fail http://localhost:8000 +services: + + # + # Less3 + # See https://hub.docker.com/r/jchristn77/less3 + # and https://github.com/jchristn/less3 + # + + litegraph: + container_name: 'less3' + image: 'jchristn77/less3:v2.1.11' + network_mode: 'host' + stdin_open: true + tty: true + volumes: + - ./system.json:/app/system.json + - ./less3.db:/app/less3.db + - ./logs/:/app/logs/ + - ./temp/:/app/temp/ + - ./disk/:/app/disk/ + healthcheck: + test: curl --fail http://localhost:8000 diff --git a/Docker/run.bat b/Docker/run.bat index 032b584..afdc61e 100644 --- a/Docker/run.bat +++ b/Docker/run.bat @@ -1,37 +1,37 @@ -@echo off - -IF "%1" == "" GOTO :Usage - -if not exist system.json ( - echo Configuration file system.json not found. - exit /b 1 -) - -REM Items that require persistence -REM system.json -REM less3.db -REM logs/ -REM temp/ -REM disk/ - -REM Argument order matters! - -docker run ^ - -p 8000:8000 ^ - -t ^ - -i ^ - -e "TERM=xterm-256color" ^ - -v .\system.json:/app/system.json ^ - -v .\less3.db:/app/less3.db ^ - -v .\logs\:/app/logs/ ^ - -v .\temp\:/app/temp/ ^ - -v .\disk\:/app/disk/ ^ - jchristn/less3:%1 - -GOTO :Done - -:Usage -ECHO Provide one argument indicating the tag. -ECHO Example: dockerrun.bat v2.1.11 -:Done -@echo on +@echo off + +IF "%1" == "" GOTO :Usage + +if not exist system.json ( + echo Configuration file system.json not found. + exit /b 1 +) + +REM Items that require persistence +REM system.json +REM less3.db +REM logs/ +REM temp/ +REM disk/ + +REM Argument order matters! + +docker run ^ + -p 8000:8000 ^ + -t ^ + -i ^ + -e "TERM=xterm-256color" ^ + -v .\system.json:/app/system.json ^ + -v .\less3.db:/app/less3.db ^ + -v .\logs\:/app/logs/ ^ + -v .\temp\:/app/temp/ ^ + -v .\disk\:/app/disk/ ^ + jchristn77/less3:%1 + +GOTO :Done + +:Usage +ECHO Provide one argument indicating the tag. +ECHO Example: dockerrun.bat v2.1.11 +:Done +@echo on diff --git a/Docker/run.sh b/Docker/run.sh index 9c73eca..2164ea4 100644 --- a/Docker/run.sh +++ b/Docker/run.sh @@ -1,33 +1,33 @@ -if [ -z "${IMG_TAG}" ]; then - IMG_TAG='v2.1.11' -fi - -echo Using image tag $IMG_TAG - -if [ ! -f "system.json" ] -then - echo Configuration file system.json not found. - exit -fi - -# Items that require persistence -# system.json -# less3.db -# logs/ -# temp/ -# disk/ - -# Argument order matters! - -docker run \ - -p 8000:8000 \ - -t \ - -i \ - -e "TERM=xterm-256color" \ - -v ./system.json:/app/system.json \ - -v ./less3.db:/app/less3.db \ - -v ./logs/:/app/logs/ \ - -v ./temp/:/app/temp/ \ - -v ./disk/:/app/disk/ \ - jchristn/less3:$IMG_TAG - +if [ -z "${IMG_TAG}" ]; then + IMG_TAG='v2.1.11' +fi + +echo Using image tag $IMG_TAG + +if [ ! -f "system.json" ] +then + echo Configuration file system.json not found. + exit +fi + +# Items that require persistence +# system.json +# less3.db +# logs/ +# temp/ +# disk/ + +# Argument order matters! + +docker run \ + -p 8000:8000 \ + -t \ + -i \ + -e "TERM=xterm-256color" \ + -v ./system.json:/app/system.json \ + -v ./less3.db:/app/less3.db \ + -v ./logs/:/app/logs/ \ + -v ./temp/:/app/temp/ \ + -v ./disk/:/app/disk/ \ + jchristn77/less3:$IMG_TAG + diff --git a/README.md b/README.md index cd0499c..36aae1a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -![alt tag](https://github.com/jchristn/less3/blob/master/assets/logo.png) +![alt tag](https://github.com/jchristn/less3/blob/main/assets/logo.png) # Less3 :: S3-Compatible Object Storage Less3 is an S3-compatible object storage platform that you can run anywhere. -![alt tag](https://github.com/jchristn/less3/blob/master/assets/diagram.png) +![alt tag](https://github.com/jchristn/less3/blob/main/assets/diagram.png) ## Use Cases @@ -254,7 +254,7 @@ Less3 is built using a series of open-source packages, including: ## Docker Deployment -Less3 is available on [DockerHub](https://hub.docker.com/r/jchristn/less3). +Less3 is available on [DockerHub](https://hub.docker.com/r/jchristn77/less3). ### Quick Start with Docker Compose diff --git a/dashboard/Dockerbuild.bat b/dashboard/Dockerbuild.bat index b5bd187..e337995 100644 --- a/dashboard/Dockerbuild.bat +++ b/dashboard/Dockerbuild.bat @@ -2,7 +2,7 @@ IF "%1" == "" GOTO :Usage ECHO. ECHO Building for linux/amd64 and linux/arm64/v8... -docker buildx build -f Dockerfile --builder cloud-viewio-assistant-builder --platform linux/amd64,linux/arm64/v8 --tag jchristn/less3-ui:%1 --push . +docker buildx build -f Dockerfile --builder cloud-jchristn77-jchristn77 --platform linux/amd64,linux/arm64/v8 --tag jchristn77/less3-ui:%1 --tag jchristn77/less3-ui:latest --push . GOTO :Done :Usage diff --git a/dashboard/Dockerrun.bat b/dashboard/Dockerrun.bat index 09c09ba..cb08560 100644 --- a/dashboard/Dockerrun.bat +++ b/dashboard/Dockerrun.bat @@ -7,7 +7,7 @@ docker run ^ -t ^ -i ^ -e "TERM=xterm-256color" ^ - jchristn/less3-ui:%1 + jchristn77/less3-ui:%1 GOTO :Done diff --git a/dashboard/Dockerrun.sh b/dashboard/Dockerrun.sh index 347fd14..d814f42 100644 --- a/dashboard/Dockerrun.sh +++ b/dashboard/Dockerrun.sh @@ -9,4 +9,4 @@ docker run \ -t \ -i \ -e "TERM=xterm-256color" \ - jchristn/less3-ui:$IMG_TAG + jchristn77/less3-ui:$IMG_TAG diff --git a/dashboard/README.md b/dashboard/README.md index e7b889a..6c15ed0 100644 --- a/dashboard/README.md +++ b/dashboard/README.md @@ -1,4 +1,4 @@ - + # Less3 UI diff --git a/src/build-docker.bat b/src/build-docker.bat index 1b0c07c..db05108 100644 --- a/src/build-docker.bat +++ b/src/build-docker.bat @@ -1,16 +1,16 @@ -@ECHO OFF -IF "%1" == "" GOTO :Usage -ECHO. -ECHO Building for linux/amd64 and linux/arm64/v8... -docker buildx build -f Less3\Dockerfile --builder cloud-viewio-assistant-builder --platform linux/amd64,linux/arm64/v8 --tag jchristn/less3:%1 --push . -GOTO :Done - -:Usage -ECHO. -ECHO Provide an argument specifying the version or tag. -ECHO Example: dockerbuild.bat v2.1.12 - -:Done -ECHO. -ECHO Done -@ECHO ON +@ECHO OFF +IF "%1" == "" GOTO :Usage +ECHO. +ECHO Building for linux/amd64 and linux/arm64/v8... +docker buildx build -f Less3\Dockerfile --builder cloud-jchristn77-jchristn77 --platform linux/amd64,linux/arm64/v8 --tag jchristn77/less3:%1 --tag jchristn77/less3:latest --push . +GOTO :Done + +:Usage +ECHO. +ECHO Provide an argument specifying the version or tag. +ECHO Example: dockerbuild.bat v2.1.12 + +:Done +ECHO. +ECHO Done +@ECHO ON